From 5558a6b7e9db81c41ed7e9cb47a9c051a40c0ebc Mon Sep 17 00:00:00 2001 From: Andrew DeMaria Date: Sat, 1 Mar 2014 20:09:58 -0700 Subject: [PATCH 1/7] Begin work on setup.py We will want to support setuptools. --- setup.py | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 setup.py diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..41c05a5 --- /dev/null +++ b/setup.py @@ -0,0 +1,6 @@ +#! /usr/bin/env python +# -*- coding: utf-8 -*- +# vim:fenc=utf-8 + +name = 'git-imerge' + From d44ad6499030791a918b437ebe9569dd2dfa6bf3 Mon Sep 17 00:00:00 2001 From: Andrew DeMaria Date: Sat, 1 Mar 2014 20:27:22 -0700 Subject: [PATCH 2/7] Flushed out more of setup.py --- setup.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 41c05a5..c51af8f 100644 --- a/setup.py +++ b/setup.py @@ -2,5 +2,20 @@ # -*- coding: utf-8 -*- # vim:fenc=utf-8 -name = 'git-imerge' +from distutils.core import setup + +setup( + name = 'git-imerge', + description = 'Incremental merge for git', + author='Michael Haggerty', + author_email='mhagger@alum.mit.edu', + url='https://github.com/mhagger/git-imerge', + packages=['git-imerge'], + license='GPL', + scripts=['bin/git-imerge'] +) + + + + From 4326425848d94e1bd6489cc0c7bee8389b41c377 Mon Sep 17 00:00:00 2001 From: Andrew DeMaria Date: Sat, 1 Mar 2014 20:34:48 -0700 Subject: [PATCH 3/7] remove extra newlines --- setup.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/setup.py b/setup.py index c51af8f..18e20a2 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,3 @@ scripts=['bin/git-imerge'] ) - - - - From a32229b89f92d57add5f1643d28e7b0650be3287 Mon Sep 17 00:00:00 2001 From: Andrew DeMaria Date: Sat, 1 Mar 2014 20:47:02 -0700 Subject: [PATCH 4/7] Added bin, moved bulk into module --- bin/git-imerge | 8 ++++++++ git-imerge/__init__.py | 1 + git-imerge => git-imerge/git-imerge.py | 5 ----- 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100755 bin/git-imerge create mode 100644 git-imerge/__init__.py rename git-imerge => git-imerge/git-imerge.py (99%) diff --git a/bin/git-imerge b/bin/git-imerge new file mode 100755 index 0000000..612d2e3 --- /dev/null +++ b/bin/git-imerge @@ -0,0 +1,8 @@ +#! /usr/bin/env python + +from git-imerge import main + +if __name__ == "__main__": + main(sys.argv[1:]) + +# vim: set expandtab ft=python: diff --git a/git-imerge/__init__.py b/git-imerge/__init__.py new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/git-imerge/__init__.py @@ -0,0 +1 @@ + diff --git a/git-imerge b/git-imerge/git-imerge.py similarity index 99% rename from git-imerge rename to git-imerge/git-imerge.py index e08a2a4..318da12 100755 --- a/git-imerge +++ b/git-imerge/git-imerge.py @@ -1,5 +1,3 @@ -#! /usr/bin/env python - # Copyright 2012-2013 Michael Haggerty # # This file is part of git-imerge. @@ -3312,7 +3310,4 @@ def main(args): else: parser.error('Unrecognized subcommand') - -main(sys.argv[1:]) - # vim: set expandtab ft=python: From 566626ca0c5e0311649ac0141e29c26d80d0a94f Mon Sep 17 00:00:00 2001 From: Andrew DeMaria Date: Sat, 1 Mar 2014 21:50:14 -0700 Subject: [PATCH 5/7] renamed module according to pep8 --- bin/git-imerge | 3 ++- {git-imerge => gitimerge}/__init__.py | 0 git-imerge/git-imerge.py => gitimerge/gitimerge.py | 2 ++ setup.py | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) rename {git-imerge => gitimerge}/__init__.py (100%) rename git-imerge/git-imerge.py => gitimerge/gitimerge.py (99%) diff --git a/bin/git-imerge b/bin/git-imerge index 612d2e3..6574ada 100755 --- a/bin/git-imerge +++ b/bin/git-imerge @@ -1,6 +1,7 @@ #! /usr/bin/env python -from git-imerge import main +from gitimerge.gitimerge import main +import sys if __name__ == "__main__": main(sys.argv[1:]) diff --git a/git-imerge/__init__.py b/gitimerge/__init__.py similarity index 100% rename from git-imerge/__init__.py rename to gitimerge/__init__.py diff --git a/git-imerge/git-imerge.py b/gitimerge/gitimerge.py similarity index 99% rename from git-imerge/git-imerge.py rename to gitimerge/gitimerge.py index 318da12..4ad9936 100755 --- a/git-imerge/git-imerge.py +++ b/gitimerge/gitimerge.py @@ -3310,4 +3310,6 @@ def main(args): else: parser.error('Unrecognized subcommand') +if __name__ == "__main__": + main(sys.argv[1:]) # vim: set expandtab ft=python: diff --git a/setup.py b/setup.py index 18e20a2..13be85a 100644 --- a/setup.py +++ b/setup.py @@ -5,12 +5,12 @@ from distutils.core import setup setup( - name = 'git-imerge', + name = 'gitimerge', description = 'Incremental merge for git', author='Michael Haggerty', author_email='mhagger@alum.mit.edu', url='https://github.com/mhagger/git-imerge', - packages=['git-imerge'], + packages=['gitimerge'], license='GPL', scripts=['bin/git-imerge'] ) From 1db9faae71e87e74f0efa95803772cf42dce9526 Mon Sep 17 00:00:00 2001 From: Andrew DeMaria Date: Sat, 1 Mar 2014 23:31:11 -0700 Subject: [PATCH 6/7] Remove useless if main check --- bin/git-imerge | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/git-imerge b/bin/git-imerge index 6574ada..1a6c84a 100755 --- a/bin/git-imerge +++ b/bin/git-imerge @@ -3,7 +3,6 @@ from gitimerge.gitimerge import main import sys -if __name__ == "__main__": - main(sys.argv[1:]) +main(sys.argv[1:]) # vim: set expandtab ft=python: From 90b9027863c9984db199bc2b33f79d733930a91d Mon Sep 17 00:00:00 2001 From: Andrew DeMaria Date: Sun, 2 Mar 2014 00:16:34 -0700 Subject: [PATCH 7/7] Added quick versioning --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 13be85a..c086bb2 100644 --- a/setup.py +++ b/setup.py @@ -8,6 +8,7 @@ name = 'gitimerge', description = 'Incremental merge for git', author='Michael Haggerty', + version='0.7.0', author_email='mhagger@alum.mit.edu', url='https://github.com/mhagger/git-imerge', packages=['gitimerge'],