##// END OF EJS Templates
Add --no-commit option to import command
Joel Rosdahl -
r5936:00dfc810 default
parent child Browse files
Show More
@@ -1528,12 +1528,13 b' def import_(ui, repo, patch1, *patches, '
1528 files=files)
1528 files=files)
1529 finally:
1529 finally:
1530 files = patch.updatedir(ui, repo, files)
1530 files = patch.updatedir(ui, repo, files)
1531 n = repo.commit(files, message, user, date)
1531 if not opts.get('no_commit'):
1532 if opts.get('exact'):
1532 n = repo.commit(files, message, user, date)
1533 if hex(n) != nodeid:
1533 if opts.get('exact'):
1534 repo.rollback()
1534 if hex(n) != nodeid:
1535 raise util.Abort(_('patch is damaged'
1535 repo.rollback()
1536 ' or loses information'))
1536 raise util.Abort(_('patch is damaged'
1537 ' or loses information'))
1537 finally:
1538 finally:
1538 os.unlink(tmpname)
1539 os.unlink(tmpname)
1539 finally:
1540 finally:
@@ -2896,6 +2897,7 b' table = {'
2896 ('b', 'base', '', _('base path')),
2897 ('b', 'base', '', _('base path')),
2897 ('f', 'force', None,
2898 ('f', 'force', None,
2898 _('skip check for outstanding uncommitted changes')),
2899 _('skip check for outstanding uncommitted changes')),
2900 ('', 'no-commit', None, _("don't commit, just update the working directory")),
2899 ('', 'exact', None,
2901 ('', 'exact', None,
2900 _('apply patch to the nodes from which it was generated')),
2902 _('apply patch to the nodes from which it was generated')),
2901 ('', 'import-branch', None,
2903 ('', 'import-branch', None,
General Comments 0
You need to be logged in to leave comments. Login now