~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Infrastructure for current directory handling
[stgit]
/
stgit
/
commands
/
pick.py
diff --git
a/stgit/commands/pick.py
b/stgit/commands/pick.py
index
a47b201
..
3acec32
100644
(file)
--- a/
stgit/commands/pick.py
+++ b/
stgit/commands/pick.py
@@
-20,6
+20,7
@@
from optparse import OptionParser, make_option
from stgit.commands.common import *
from stgit.utils import *
from stgit.commands.common import *
from stgit.utils import *
+from stgit.out import *
from stgit import stack, git
from stgit.stack import Series
from stgit import stack, git
from stgit.stack import Series
@@
-33,6
+34,7
@@
the name of the current patch. It can be overridden with the '--name'
option. A commit object can be reverted with the '--reverse'
option. The log and author information are those of the commit object."""
option. A commit object can be reverted with the '--reverse'
option. The log and author information are those of the commit object."""
+directory = DirectoryHasRepository()
options = [make_option('-n', '--name',
help = 'use NAME as the patch name'),
make_option('-r', '--reverse',
options = [make_option('-n', '--name',
help = 'use NAME as the patch name'),
make_option('-r', '--reverse',
@@
-40,6
+42,9
@@
options = [make_option('-n', '--name',
action = 'store_true'),
make_option('-p', '--parent', metavar = 'COMMITID',
help = 'use COMMITID as parent'),
action = 'store_true'),
make_option('-p', '--parent', metavar = 'COMMITID',
help = 'use COMMITID as parent'),
+ make_option('-x', '--expose',
+ help = 'append the imported commit id to the patch log',
+ action = 'store_true'),
make_option('--fold',
help = 'fold the commit object into the current patch',
action = 'store_true'),
make_option('--fold',
help = 'fold the commit object into the current patch',
action = 'store_true'),
@@
-111,6
+116,8
@@
def func(parser, options, args):
out.done()
else:
message = commit.get_log()
out.done()
else:
message = commit.get_log()
+ if options.expose:
+ message += '(imported from commit %s)\n' % commit.get_id_hash()
author_name, author_email, author_date = \
name_email_date(commit.get_author())
author_name, author_email, author_date = \
name_email_date(commit.get_author())
@@
-121,6
+128,9
@@
def func(parser, options, args):
author_name = author_name,
author_email = author_email,
author_date = author_date)
author_name = author_name,
author_email = author_email,
author_date = author_date)
+ # in case the patch name was automatically generated
+ patchname = newpatch.get_name()
+
# find a patchlog to fork from
(refpatchname, refbranchname, refpatchid) = parse_rev(commit_str)
if refpatchname and not refpatchid and \
# find a patchlog to fork from
(refpatchname, refbranchname, refpatchid) = parse_rev(commit_str)
if refpatchname and not refpatchid and \