Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
mercurial-devel
Commits
a2aa39a725a1
Commit
a2aa39a725a1
authored
9 years ago
by
Stanislau Hlebik
Browse files
Options
Downloads
Patches
Plain Diff
rebase: add date parameter to concludenode function
This parameter will allow us to set the date of rebased commits
parent
ad443e8d9334
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
hgext/rebase.py
+4
-2
4 additions, 2 deletions
hgext/rebase.py
with
4 additions
and
2 deletions
hgext/rebase.py
+
4
−
2
View file @
a2aa39a7
...
...
@@ -586,7 +586,7 @@
'
,
'
.
join
(
str
(
p
)
for
p
in
sorted
(
parents
))))
def
concludenode
(
repo
,
rev
,
p1
,
p2
,
commitmsg
=
None
,
editor
=
None
,
extrafn
=
None
,
keepbranches
=
False
):
keepbranches
=
False
,
date
=
None
):
'''
Commit the wd changes with parents p1 and p2. Reuse commit info from rev
but also store useful information in extra.
Return node of committed revision.
'''
...
...
@@ -608,4 +608,6 @@
if
keepbranch
:
repo
.
ui
.
setconfig
(
'
ui
'
,
'
allowemptycommit
'
,
True
)
# Commit might fail if unresolved files exist
if
date
is
None
:
date
=
ctx
.
date
()
newnode
=
repo
.
commit
(
text
=
commitmsg
,
user
=
ctx
.
user
(),
...
...
@@ -611,5 +613,5 @@
newnode
=
repo
.
commit
(
text
=
commitmsg
,
user
=
ctx
.
user
(),
date
=
ctx
.
date
()
,
extra
=
extra
,
editor
=
editor
)
date
=
date
,
extra
=
extra
,
editor
=
editor
)
finally
:
repo
.
ui
.
restoreconfig
(
backup
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment