D2277: remotenames: don't use the default value of logfmt for namespaces

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Thu Feb 15 12:02:31 UTC 2018


pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  logfmt is the format which is used to format the log output for that namespace.
  This patch passes "remote {bookmark|branch}:  %s" as the logfmt. Space is not
  added after bookmark and branch to make output consistent with other details.
  
  Still this is not the best output. We may need to wrap getlogcolumns() to change
  spacing in the in built columns to match the remotenames one.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2277

AFFECTED FILES
  hgext/remotenames.py
  tests/test-logexchange.t

CHANGE DETAILS

diff --git a/tests/test-logexchange.t b/tests/test-logexchange.t
--- a/tests/test-logexchange.t
+++ b/tests/test-logexchange.t
@@ -127,24 +127,24 @@
   @  changeset:   8:3e1487808078
   |  branch:      wat
   |  tag:         tip
-  |  remote branch:$TESTTMP/server2/wat
-  |  remote branch:default/wat
+  |  remote branch:  $TESTTMP/server2/wat
+  |  remote branch:  default/wat
   |  parent:      4:aa98ab95a928
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     added bar
   |
   | o  changeset:   7:ec2426147f0e
-  | |  remote branch:$TESTTMP/server2/default
-  | |  remote branch:default/default
+  | |  remote branch:  $TESTTMP/server2/default
+  | |  remote branch:  default/default
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Added h
   | |
   | o  changeset:   6:87d6d6676308
   | |  bookmark:    bar
-  | |  remote bookmark:$TESTTMP/server2/bar
-  | |  remote bookmark:default/bar
+  | |  remote bookmark:  $TESTTMP/server2/bar
+  | |  remote bookmark:  default/bar
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     Added g
@@ -161,8 +161,8 @@
   |
   o  changeset:   3:62615734edd5
   |  bookmark:    foo
-  |  remote bookmark:$TESTTMP/server2/foo
-  |  remote bookmark:default/foo
+  |  remote bookmark:  $TESTTMP/server2/foo
+  |  remote bookmark:  default/foo
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     Added d
diff --git a/hgext/remotenames.py b/hgext/remotenames.py
--- a/hgext/remotenames.py
+++ b/hgext/remotenames.py
@@ -194,6 +194,7 @@
             templatename='remotebookmarks',
             logname='remote bookmark',
             colorname='remotebookmark',
+            logfmt='remote bookmark:  %s\n',
             listnames=lambda repo: repo._remotenames.bmarktonodes().keys(),
             namemap=lambda repo, name:
                 repo._remotenames.bmarktonodes().get(name, []),
@@ -207,6 +208,7 @@
             templatename='remotebranches',
             logname='remote branch',
             colorname='remotebranch',
+            logfmt='remote branch:  %s\n',
             listnames = lambda repo: repo._remotenames.branchtonodes().keys(),
             namemap = lambda repo, name:
                 repo._remotenames.branchtonodes().get(name, []),



To: pulkit, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list