equal
deleted
inserted
replaced
77 default=10, |
77 default=10, |
78 ) |
78 ) |
79 |
79 |
80 backupdir = 'shelve-backup' |
80 backupdir = 'shelve-backup' |
81 shelvedir = 'shelved' |
81 shelvedir = 'shelved' |
82 shelvefileextensions = ['hg', 'patch'] |
82 shelvefileextensions = ['hg', 'patch', 'shelve'] |
83 # universal extension is present in all types of shelves |
83 # universal extension is present in all types of shelves |
84 patchextension = 'patch' |
84 patchextension = 'patch' |
85 |
85 |
86 # we never need the user, so we use a |
86 # we never need the user, so we use a |
87 # generic user for all shelve operations |
87 # generic user for all shelve operations |
407 "'hg status')\n") % len(stat.deleted)) |
407 "'hg status')\n") % len(stat.deleted)) |
408 else: |
408 else: |
409 ui.status(_("nothing changed\n")) |
409 ui.status(_("nothing changed\n")) |
410 |
410 |
411 def _shelvecreatedcommit(repo, node, name): |
411 def _shelvecreatedcommit(repo, node, name): |
|
412 info = {'node': nodemod.hex(node)} |
|
413 shelvedfile(repo, name, 'shelve').writeinfo(info) |
412 bases = list(mutableancestors(repo[node])) |
414 bases = list(mutableancestors(repo[node])) |
413 shelvedfile(repo, name, 'hg').writebundle(bases, node) |
415 shelvedfile(repo, name, 'hg').writebundle(bases, node) |
414 with shelvedfile(repo, name, patchextension).opener('wb') as fp: |
416 with shelvedfile(repo, name, patchextension).opener('wb') as fp: |
415 cmdutil.exportfile(repo, [node], fp, opts=mdiff.diffopts(git=True)) |
417 cmdutil.exportfile(repo, [node], fp, opts=mdiff.diffopts(git=True)) |
416 |
418 |