Mercurial > hg-git

changeset 334:eb345bacc1da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cope with tags being sorted (hg cset c7dbd6c4877a) by backporting that behavior
author Augie Fackler <durin42@gmail.com>
date Sat, 12 Jun 2010 21:14:33 -0500
parents b002cc0d2472
children d61881f463ce
files hggit/__init__.py tests/test-encoding.out tests/test-file-removal.out tests/test-git-clone.out tests/test-git-submodules.out tests/test-git-tags.out tests/test-hg-author.out tests/test-hg-branch.out tests/test-hg-tags.out tests/test-octopus.out tests/test-pull-after-strip.out tests/test-pull.out
diffstat 12 files changed, 41 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/__init__.py	Sat Jun 12 21:12:21 2010 -0500
+++ b/hggit/__init__.py	Sat Jun 12 21:14:33 2010 -0500
@@ -17,7 +17,11 @@
 
 import os
 
-from mercurial import commands, extensions, hg, util as hgutil
+from mercurial import commands
+from mercurial import extensions
+from mercurial import hg
+from mercurial import localrepo
+from mercurial import util as hgutil
 from mercurial.i18n import _
 
 import gitrepo, hgrepo
@@ -92,6 +96,13 @@
     map(f.write, new_map)
     ui.status(_('git commit map cleaned\n'))
 
+# drop this when we're 1.6-only, this just backports new behavior
+def sortednodetags(orig, *args, **kwargs):
+    ret = orig(*args, **kwargs)
+    ret.sort()
+    return ret
+extensions.wrapfunction(localrepo.localrepository, 'nodetags', sortednodetags)
+
 cmdtable = {
   "gimport":
         (gimport, [], _('hg gimport')),
--- a/tests/test-encoding.out	Sat Jun 12 21:12:21 2010 -0500
+++ b/tests/test-encoding.out	Sat Jun 12 21:14:33 2010 -0500
@@ -15,8 +15,8 @@
 importing Git objects into Hg
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   3:8549ee7fe0801b2dafc06047ca6f66d36da709f5
+|  tag:         default/master
 |  tag:         master
-|  tag:         default/master
 |  tag:         tip
 |  parent:      2:0422fbb4ec39fb69e87b94a3874ac890333de11a
 |  parent:      -1:0000000000000000000000000000000000000000
--- a/tests/test-file-removal.out	Sat Jun 12 21:12:21 2010 -0500
+++ b/tests/test-file-removal.out	Sat Jun 12 21:14:33 2010 -0500
@@ -13,8 +13,8 @@
 importing Git objects into Hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   4:ea41a3f0ed10
+|  tag:         default/master
 |  tag:         master
-|  tag:         default/master
 |  tag:         tip
 |  user:        test <test@example.org>
 |  date:        Mon Jan 01 00:00:14 2007 +0000
--- a/tests/test-git-clone.out	Sat Jun 12 21:12:21 2010 -0500
+++ b/tests/test-git-clone.out	Sat Jun 12 21:14:33 2010 -0500
@@ -7,8 +7,8 @@
 importing Git objects into Hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
+|  tag:         default/master
 |  tag:         master
-|  tag:         default/master
 |  tag:         tip
 |  user:        test <test@example.org>
 |  date:        Mon Jan 01 00:00:11 2007 +0000
--- a/tests/test-git-submodules.out	Sat Jun 12 21:12:21 2010 -0500
+++ b/tests/test-git-submodules.out	Sat Jun 12 21:14:33 2010 -0500
@@ -23,8 +23,8 @@
 importing Git objects into Hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   2:954cdf1c8c82
+|  tag:         default/master
 |  tag:         master
-|  tag:         default/master
 |  tag:         tip
 |  user:        test <test@example.org>
 |  date:        Mon Jan 01 00:00:11 2007 +0000
--- a/tests/test-git-tags.out	Sat Jun 12 21:12:21 2010 -0500
+++ b/tests/test-git-tags.out	Sat Jun 12 21:14:33 2010 -0500
@@ -7,10 +7,10 @@
 importing Git objects into Hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:99dcc15b7b07
+|  tag:         beta
 |  tag:         default/master
+|  tag:         master
 |  tag:         tip
-|  tag:         beta
-|  tag:         master
 |  user:        test <test@example.org>
 |  date:        Mon Jan 01 00:00:12 2007 +0000
 |  summary:     add beta
--- a/tests/test-hg-author.out	Sat Jun 12 21:12:21 2010 -0500
+++ b/tests/test-hg-author.out	Sat Jun 12 21:14:33 2010 -0500
@@ -18,9 +18,9 @@
     default::refs/heads/not-master => GIT:7eeab2ea
     default::refs/heads/master => GIT:2b9ec6a4
 @  changeset:   2:92d33c0dd6e1
+|  tag:         default/master
 |  tag:         master
 |  tag:         tip
-|  tag:         default/master
 |  user:        test <test@example.com> (comment)
 |  date:        Mon Jan 01 00:00:12 2007 +0000
 |  summary:     modify beta
@@ -31,8 +31,8 @@
 |  summary:     add beta
 |
 o  changeset:   0:3442585be8a6
+   tag:         default/not-master
    tag:         not-master
-   tag:         default/not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -44,9 +44,9 @@
 importing Git objects into Hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   2:92d33c0dd6e1
+|  tag:         default/master
 |  tag:         master
 |  tag:         tip
-|  tag:         default/master
 |  user:        test <test@example.com> (comment)
 |  date:        Mon Jan 01 00:00:12 2007 +0000
 |  summary:     modify beta
@@ -57,8 +57,8 @@
 |  summary:     add beta
 |
 o  changeset:   0:3442585be8a6
+   tag:         default/not-master
    tag:         not-master
-   tag:         default/not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
--- a/tests/test-hg-branch.out	Sat Jun 12 21:12:21 2010 -0500
+++ b/tests/test-hg-branch.out	Sat Jun 12 21:14:33 2010 -0500
@@ -20,9 +20,9 @@
     default::refs/heads/master => GIT:296802ef
 @  changeset:   2:d93a72262a83
 |  branch:      gamma
+|  tag:         default/master
 |  tag:         master
 |  tag:         tip
-|  tag:         default/master
 |  user:        test
 |  date:        Mon Jan 01 00:00:12 2007 +0000
 |  summary:     started branch gamma
@@ -33,8 +33,8 @@
 |  summary:     rename alpha to beta
 |
 o  changeset:   0:3442585be8a6
+   tag:         default/not-master
    tag:         not-master
-   tag:         default/not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -47,9 +47,9 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 o  changeset:   2:d93a72262a83
 |  branch:      gamma
+|  tag:         default/master
 |  tag:         master
 |  tag:         tip
-|  tag:         default/master
 |  user:        test
 |  date:        Mon Jan 01 00:00:12 2007 +0000
 |  summary:     started branch gamma
@@ -60,8 +60,8 @@
 |  summary:     rename alpha to beta
 |
 o  changeset:   0:3442585be8a6
+   tag:         default/not-master
    tag:         not-master
-   tag:         default/not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
--- a/tests/test-hg-tags.out	Sat Jun 12 21:12:21 2010 -0500
+++ b/tests/test-hg-tags.out	Sat Jun 12 21:14:33 2010 -0500
@@ -14,17 +14,17 @@
     default::refs/tags/alpha => GIT:7eeab2ea
     default::refs/heads/master => GIT:9a2616b9
 @  changeset:   1:d529e9229f6d
+|  tag:         default/master
 |  tag:         master
 |  tag:         tip
-|  tag:         default/master
 |  user:        test
 |  date:        Mon Jan 01 00:00:11 2007 +0000
 |  summary:     Added tag alpha for changeset 3442585be8a6
 |
 o  changeset:   0:3442585be8a6
-   tag:         not-master
    tag:         alpha
    tag:         default/not-master
+   tag:         not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -38,17 +38,17 @@
 importing Git objects into Hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:d529e9229f6d
+|  tag:         default/master
 |  tag:         master
 |  tag:         tip
-|  tag:         default/master
 |  user:        test
 |  date:        Mon Jan 01 00:00:11 2007 +0000
 |  summary:     Added tag alpha for changeset 3442585be8a6
 |
 o  changeset:   0:3442585be8a6
-   tag:         not-master
    tag:         alpha
    tag:         default/not-master
+   tag:         not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
--- a/tests/test-octopus.out	Sat Jun 12 21:12:21 2010 -0500
+++ b/tests/test-octopus.out	Sat Jun 12 21:14:33 2010 -0500
@@ -20,8 +20,8 @@
 importing Git objects into Hg
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @    changeset:   5:6523aa9f4775
-|\   tag:         master
-| |  tag:         default/master
+|\   tag:         default/master
+| |  tag:         master
 | |  tag:         tip
 | |  parent:      3:1436150b86c2
 | |  parent:      4:7f6c791a169f
--- a/tests/test-pull-after-strip.out	Sat Jun 12 21:12:21 2010 -0500
+++ b/tests/test-pull-after-strip.out	Sat Jun 12 21:14:33 2010 -0500
@@ -8,10 +8,10 @@
 importing Git objects into Hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   0:3442585be8a6
-   tag:         master
+   tag:         alpha
    tag:         default/master
+   tag:         master
    tag:         tip
-   tag:         alpha
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -24,17 +24,17 @@
 importing Git objects into Hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
+|  tag:         beta
 |  tag:         default/beta
 |  tag:         tip
-|  tag:         beta
 |  user:        test <test@example.org>
 |  date:        Mon Jan 01 00:00:11 2007 +0000
 |  summary:     add beta
 |
 o  changeset:   0:3442585be8a6
-   tag:         master
    tag:         alpha
    tag:         default/master
+   tag:         master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -57,10 +57,10 @@
 importing Git objects into Hg
 (run 'hg update' to get a working copy)
 o  changeset:   2:611948b1ec6a
+|  tag:         beta
 |  tag:         default/beta
+|  tag:         master
 |  tag:         tip
-|  tag:         beta
-|  tag:         master
 |  user:        test <test@example.org>
 |  date:        Mon Jan 01 00:00:12 2007 +0000
 |  summary:     add to beta
--- a/tests/test-pull.out	Sat Jun 12 21:12:21 2010 -0500
+++ b/tests/test-pull.out	Sat Jun 12 21:14:33 2010 -0500
@@ -10,8 +10,8 @@
 @  changeset:   0:3442585be8a6
    tag:         alpha
    tag:         default/master
+   tag:         master
    tag:         tip
-   tag:         master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -24,17 +24,17 @@
 importing Git objects into Hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
+|  tag:         beta
 |  tag:         default/beta
-|  tag:         beta
 |  tag:         tip
 |  user:        test <test@example.org>
 |  date:        Mon Jan 01 00:00:11 2007 +0000
 |  summary:     add beta
 |
 o  changeset:   0:3442585be8a6
-   tag:         master
    tag:         alpha
    tag:         default/master
+   tag:         master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha