Mercurial > hg > hg-git

changeset 824:f16eaf601496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gimport: support git.mindate
author Siddharth Agarwal <sid0@fb.com>
date Wed, 29 Oct 2014 19:37:23 -0700
parents c29eaba651d7
children 27ac3cb46c9d
files hggit/git_handler.py tests/test-git-workflow.t
diffstat 2 files changed, 59 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -220,7 +220,8 @@
 
     def import_commits(self, remote_name):
         refs = self.git.refs.as_dict()
-        self.import_git_objects(remote_name, refs)
+        filteredrefs = self.filter_min_date(refs)
+        self.import_git_objects(remote_name, filteredrefs)
         self.update_hg_bookmarks(refs)
         self.save_map()
 
--- a/tests/test-git-workflow.t
+++ b/tests/test-git-workflow.t
@@ -75,3 +75,60 @@
 gimport should have updated the bookmarks as well
   $ hg bookmarks
      master                    1:7108ae7bd184
+
+gimport support for git.mindate
+  $ cat >> .hg/hgrc << EOF
+  > [git]
+  > mindate = 2014-01-02 00:00:00 +0000
+  > EOF
+  $ echo oldcommit > oldcommit
+  $ git add oldcommit
+  $ GIT_AUTHOR_DATE="2014-03-01 00:00:00 +0000" \
+  > GIT_COMMITTER_DATE="2009-01-01 00:00:00 +0000" \
+  > git commit -m oldcommit > /dev/null || echo "git commit error"
+  $ hg gimport
+  no changes found
+  $ hg log --graph
+  o  changeset:   1:7108ae7bd184
+  |  bookmark:    master
+  |  tag:         tip
+  |  user:        test <test@example.org>
+  |  date:        Mon Jan 01 00:00:11 2007 +0000
+  |  summary:     add beta
+  |
+  o  changeset:   0:0221c246a567
+     user:        test
+     date:        Mon Jan 01 00:00:10 2007 +0000
+     summary:     add alpha
+  
+
+  $ echo newcommit > newcommit
+  $ git add newcommit
+  $ GIT_AUTHOR_DATE="2014-01-01 00:00:00 +0000" \
+  > GIT_COMMITTER_DATE="2014-01-02 00:00:00 +0000" \
+  > git commit -m newcommit > /dev/null || echo "git commit error"
+  $ hg gimport
+  importing git objects into hg
+  $ hg log --graph
+  o  changeset:   3:865f98279824
+  |  bookmark:    master
+  |  tag:         tip
+  |  user:        test <test@example.org>
+  |  date:        Wed Jan 01 00:00:00 2014 +0000
+  |  summary:     newcommit
+  |
+  o  changeset:   2:b6cde64c110c
+  |  user:        test <test@example.org>
+  |  date:        Sat Mar 01 00:00:00 2014 +0000
+  |  summary:     oldcommit
+  |
+  o  changeset:   1:7108ae7bd184
+  |  user:        test <test@example.org>
+  |  date:        Mon Jan 01 00:00:11 2007 +0000
+  |  summary:     add beta
+  |
+  o  changeset:   0:0221c246a567
+     user:        test
+     date:        Mon Jan 01 00:00:10 2007 +0000
+     summary:     add alpha
+