| Mon, 18 May 2020 14:59:59 -0400 |
Augie Fackler |
mergestate: split out merge state handling code from main merge module
|
| Thu, 09 Apr 2020 16:06:03 +0530 |
Pulkit Goyal |
mergestate: store about files resolved in favour of other
|
| Fri, 06 Mar 2020 13:27:41 -0500 |
Augie Fackler |
cleanup: run pyupgrade on our source tree to clean up varying things
|
| Wed, 26 Feb 2020 10:40:31 -0800 |
Martin von Zweigbergk |
merge: introduce a merge() for that use-case
|
| Thu, 13 Feb 2020 17:15:08 -0800 |
Martin von Zweigbergk |
mergestate: determine if active without looking for state files on disk
|
| Mon, 17 Feb 2020 20:30:03 -0500 |
Valentin Gatien-Baron |
graft: always allow hg graft --base . (issue6248)
|
| Sat, 08 Feb 2020 10:22:47 -0500 |
Valentin Gatien-Baron |
purge: add -i flag to delete ignored files instead of untracked files
|
| Wed, 05 Feb 2020 17:12:39 -0500 |
Augie Fackler |
merge: use manifestdict.walk() instead of manifestdict.matches()
|
| Wed, 15 Jan 2020 14:47:38 -0800 |
Martin von Zweigbergk |
merge: introduce a revert_to() for that use-case
|
| Wed, 15 Jan 2020 15:30:25 -0800 |
Martin von Zweigbergk |
merge: introduce a clean_update() for that use-case
|
| Wed, 29 Jan 2020 11:30:16 -0800 |
Martin von Zweigbergk |
mergestate: add accessors for local and other nodeid, not just contexts
|
| Tue, 28 Jan 2020 14:53:23 -0800 |
Martin von Zweigbergk |
graft: default `base` argument to common case of `ctx.p1()`
|
| Fri, 10 Jan 2020 13:12:24 -0800 |
Martin von Zweigbergk |
graft: let caller pass in overlayworkingctx to merge.graft()
|
| Thu, 23 Jan 2020 15:44:30 -0800 |
Martin von Zweigbergk |
merge: start using the per-side copy dicts
|
| Wed, 22 Jan 2020 14:35:30 -0800 |
Martin von Zweigbergk |
copies: define a type to return from mergecopies()
|
| Wed, 22 Jan 2020 16:45:56 -0800 |
Martin von Zweigbergk |
merge: move initialization of copy dicts to one place
|
| Wed, 15 Jan 2020 15:12:50 -0800 |
Martin von Zweigbergk |
merge: avoid a negation in the definition of updatedirstate
|
| Fri, 24 Jan 2020 08:32:35 -0800 |
Martin von Zweigbergk |
merge: move definition of `partial` closer to where it's used
|
| Wed, 15 Jan 2020 15:08:42 -0800 |
Martin von Zweigbergk |
merge: define updatedirstate a little earlier and reuse it
|
| Wed, 15 Jan 2020 15:07:43 -0800 |
Martin von Zweigbergk |
merge: don't call update hook when using in-memory context
|
| Fri, 27 Dec 2019 13:47:59 -0800 |
Martin von Zweigbergk |
graftcopies: remove `skip` and `repo` arguments
|
| Mon, 06 Jan 2020 15:24:36 -0800 |
Martin von Zweigbergk |
copies: replace duplicatecopies() by function that takes contexts
|
| Fri, 27 Dec 2019 13:03:40 -0800 |
Martin von Zweigbergk |
graft: extract repo[None] to a variable
|
| Mon, 13 Jan 2020 17:15:14 -0500 |
Augie Fackler |
core: migrate uses of hashlib.sha1 to hashutil.sha1
|
| Thu, 05 Dec 2019 09:39:49 -0800 |
Martin von Zweigbergk |
graft: never set both parents equal in the dirstate (issue6098)
|
| Thu, 05 Dec 2019 09:34:43 -0800 |
Martin von Zweigbergk |
graft: extract `repo['.']` to local variable
|
| Thu, 05 Dec 2019 09:32:47 -0800 |
Martin von Zweigbergk |
graft: rename `pctx` argument to `base` since that's what it is
|
| Sun, 01 Dec 2019 18:46:10 -0500 |
Matt Harbison |
cleanup: fix docstring formatting
|
| Fri, 15 Nov 2019 15:36:09 -0800 |
Martin von Zweigbergk |
dirstate: include explicit matches in match.traversedir calls
|
| Thu, 14 Nov 2019 08:03:26 -0800 |
Martin von Zweigbergk |
utils: move finddirs() to pathutil
|
