From 8b0fca64daed0f94ff8de81deddee2cbd5a155e9 Mon Sep 17 00:00:00 2001 From: Rocco Rutte Date: Mon, 19 Mar 2007 09:18:20 +0000 Subject: [PATCH] License hg-reset.py under GPLv2 as it uses mercurial code Signed-off-by: Rocco Rutte --- hg-fast-export.txt | 17 +++++++++++++---- hg-reset.py | 5 ++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/hg-fast-export.txt b/hg-fast-export.txt index 2fdabab..1b8bb1c 100644 --- a/hg-fast-export.txt +++ b/hg-fast-export.txt @@ -3,14 +3,15 @@ hg-fast-import.(sh|py) - mercurial to git converter using git-fast-import Legal ===== -The scripts are licensed under the MIT license[0] and were written by -Rocco Rutte with hints and help from the git list and -#mercurial on freenode. +Most hg-* scripts are licensed under the MIT license[0] and were written +by Rocco Rutte with hints and help from the git list and +#mercurial on freenode. hg-reset.py is licensed under GPLv2 since it +copies some code from the mercurial sources. Usage ===== -Using it is quite simple for a mercurial repository : +Using hg-fast-export is quite simple for a mercurial repository : mkdir repo-git # or whatever cd repo-git @@ -19,6 +20,14 @@ Using it is quite simple for a mercurial repository : Incremental imports to track hg repos is supported, too. +Using hg-reset it is quite simple within a git repository that is +hg-fast-export'ed from mercurial: + + hg-reset.sh -R + +will give hints on which branches need adjustment for starting over +again. + Notes/Limitations ================= diff --git a/hg-reset.py b/hg-reset.py index 8e1fa87..6b84a37 100755 --- a/hg-reset.py +++ b/hg-reset.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # Copyright (c) 2007 Rocco Rutte -# License: MIT +# License: GPLv2 from mercurial import repo,hg,cmdutil,util,ui,revlog,node from hg2git import setup_repo,load_cache,get_changeset @@ -9,6 +9,9 @@ from optparse import OptionParser import sys def heads(ui,repo,start=None,stop=None,max=None): + # this is copied from mercurial/revlog.py and differs only in + # accepting a max argument for xrange(startrev+1,...) defaulting + # to the original repo.changelog.count() if start is None: start = node.nullid if stop is None: -- 2.11.4.GIT