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

login
register
mail settings
Submitter phabricator
Date Feb. 18, 2018, 4:49 a.m.
Message ID <3bb66c9d7b93252bd67cf789ac59f083@localhost.localdomain>
Download mbox | patch
Permalink /patch/28035/
State Not Applicable
Headers show

Comments

phabricator - Feb. 18, 2018, 4:49 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG18e29c65bc5c: remotenames: don&#039;t use the default value of logfmt for namespaces (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2277?vs=5777&id=5817

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

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

CHANGE DETAILS




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

Patch

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
@@ -204,8 +204,8 @@ 
         remotebookmarkns = ns(
             'remotebookmarks',
             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, []),
@@ -217,8 +217,8 @@ 
         remotebranchns = ns(
             'remotebranches',
             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, []),