Submitter | Stanislau Hlebik |
---|---|
Date | Nov. 3, 2015, 6:52 p.m. |
Message ID | <93b187ce4d77839c3576.1446576735@devvm201.lla1.facebook.com> |
Download | mbox | patch |
Permalink | /patch/11279/ |
State | Accepted |
Headers | show |
Comments
On Tue, Nov 03, 2015 at 10:52:15AM -0800, Stanislau Hlebik wrote: > # HG changeset patch > # User Stanislau Hlebik <stash@fb.com> > # Date 1445852148 25200 > # Mon Oct 26 02:35:48 2015 -0700 > # Node ID 93b187ce4d77839c3576db4d0ee626bbb8089382 > # Parent bb57790670b9c756e8559250fd9c782b8eaa7df5 > rebase: pass date parameter to concludenode Queued these first two, thanks. > > diff --git a/hgext/rebase.py b/hgext/rebase.py > --- a/hgext/rebase.py > +++ b/hgext/rebase.py > @@ -220,6 +220,7 @@ > abortf = opts.get('abort') > collapsef = opts.get('collapse', False) > collapsemsg = cmdutil.logmessage(ui, opts) > + date = opts.get('date', None) > e = opts.get('extrafn') # internal, used by e.g. hgsubversion > extrafns = [_savegraft] > if e: > @@ -454,7 +455,8 @@ > editor = cmdutil.getcommiteditor(editform=editform, **opts) > newnode = concludenode(repo, rev, p1, p2, extrafn=extrafn, > editor=editor, > - keepbranches=keepbranchesf) > + keepbranches=keepbranchesf, > + date=date) > else: > # Skip commit if we are collapsing > repo.dirstate.beginparentchange() > @@ -505,7 +507,8 @@ > editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) > newnode = concludenode(repo, rev, p1, external, commitmsg=commitmsg, > extrafn=extrafn, editor=editor, > - keepbranches=keepbranchesf) > + keepbranches=keepbranchesf, > + date=date) > if newnode is None: > newrev = target > else: > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@selenic.com > https://selenic.com/mailman/listinfo/mercurial-devel
Patch
diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -220,6 +220,7 @@ abortf = opts.get('abort') collapsef = opts.get('collapse', False) collapsemsg = cmdutil.logmessage(ui, opts) + date = opts.get('date', None) e = opts.get('extrafn') # internal, used by e.g. hgsubversion extrafns = [_savegraft] if e: @@ -454,7 +455,8 @@ editor = cmdutil.getcommiteditor(editform=editform, **opts) newnode = concludenode(repo, rev, p1, p2, extrafn=extrafn, editor=editor, - keepbranches=keepbranchesf) + keepbranches=keepbranchesf, + date=date) else: # Skip commit if we are collapsing repo.dirstate.beginparentchange() @@ -505,7 +507,8 @@ editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) newnode = concludenode(repo, rev, p1, external, commitmsg=commitmsg, extrafn=extrafn, editor=editor, - keepbranches=keepbranchesf) + keepbranches=keepbranchesf, + date=date) if newnode is None: newrev = target else: