| Fri, 24 Jul 2020 19:13:20 +0530 |
Pulkit Goyal |
merge: filter actions before calling _resolvetrivial()
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 18:16:29 +0530 |
Pulkit Goyal |
merge: introduce mergeresult.updateactions() and use it
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 17:57:23 +0530 |
Pulkit Goyal |
merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 17:52:33 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 17:49:13 +0530 |
Pulkit Goyal |
merge: pass mergeresult obj instead of actions in _filternarrowactions()
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 17:31:26 +0530 |
Pulkit Goyal |
merge: pass mergeresult in checkpassconflicts() instead of actions (API)
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 16:23:55 +0530 |
Pulkit Goyal |
merge: add removefile() to mergeresult object
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 16:18:39 +0530 |
Pulkit Goyal |
merge: introduce mergeresult.addfile() and use it
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 15:56:11 +0530 |
Pulkit Goyal |
merge: make mergeresult constructor initialize empty object
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 15:15:20 +0530 |
Pulkit Goyal |
merge: improve documentation of fbid dict used for merge bid
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 14:45:00 +0530 |
Pulkit Goyal |
merge: move conversion of file-key dict to action-key dict in mergeresult
|
file |
diff |
annotate
|
| Sun, 02 Aug 2020 10:12:21 -0700 |
Pulkit Goyal |
merge: introduce hasconflicts() on mergeresult object
|
file |
diff |
annotate
|
| Tue, 14 Jul 2020 16:40:28 +0530 |
Pulkit Goyal |
merge: remove no longer required ACTION_GET_OTHER_AND_STORE
|
file |
diff |
annotate
|
| Tue, 14 Jul 2020 16:31:52 +0530 |
Pulkit Goyal |
merge: pass commitinfo to applyupdates() and get it stored in mergestate
|
file |
diff |
annotate
|
| Tue, 14 Jul 2020 16:21:08 +0530 |
Pulkit Goyal |
merge: introduce 'commitinfo' in mergeresult
|
file |
diff |
annotate
|
| Thu, 23 Jul 2020 18:03:14 +0530 |
Pulkit Goyal |
merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)
|
file |
diff |
annotate
|
| Tue, 14 Jul 2020 15:42:28 +0530 |
Pulkit Goyal |
merge: document return values of manifestmerge() and calculateupdates()
|
file |
diff |
annotate
|
| Thu, 09 Jul 2020 19:02:10 +0530 |
Pulkit Goyal |
merge: refactor code to advise fsmonitor in separate function
|
file |
diff |
annotate
|
| Thu, 09 Jul 2020 14:44:58 +0530 |
Pulkit Goyal |
mergestate: rename addpath() -> addpathonflict() to prevent confusion
|
file |
diff |
annotate
|
| Mon, 06 Jul 2020 03:43:32 +0200 |
Joerg Sonnenberger |
manifest: tigher manifest parsing and flag use
|
file |
diff |
annotate
|
| Thu, 09 Jul 2020 18:48:55 -0700 |
Rodrigo Damazio Bovendorp |
scmutil: allowing different files to be prefetched per revision
|
file |
diff |
annotate
|
| Wed, 24 Jun 2020 23:17:56 -0700 |
Martin von Zweigbergk |
merge: don't grab wlock when merging in memory
|
file |
diff |
annotate
|
| Fri, 05 Jun 2020 11:10:33 -0700 |
Martin von Zweigbergk |
merge: move an inspection of the dirstate from record to calculate phase
|
file |
diff |
annotate
|
| Mon, 18 May 2020 14:59:59 -0400 |
Augie Fackler |
mergestate: split out merge state handling code from main merge module
|
file |
diff |
annotate
|
| Thu, 09 Apr 2020 16:06:03 +0530 |
Pulkit Goyal |
mergestate: store about files resolved in favour of other
|
file |
diff |
annotate
|
| Fri, 06 Mar 2020 13:27:41 -0500 |
Augie Fackler |
cleanup: run pyupgrade on our source tree to clean up varying things
|
file |
diff |
annotate
|
| Wed, 26 Feb 2020 10:40:31 -0800 |
Martin von Zweigbergk |
merge: introduce a merge() for that use-case
|
file |
diff |
annotate
|
| Thu, 13 Feb 2020 17:15:08 -0800 |
Martin von Zweigbergk |
mergestate: determine if active without looking for state files on disk
|
file |
diff |
annotate
|
| Mon, 17 Feb 2020 20:30:03 -0500 |
Valentin Gatien-Baron |
graft: always allow hg graft --base . (issue6248)
|
file |
diff |
annotate
|
| Sat, 08 Feb 2020 10:22:47 -0500 |
Valentin Gatien-Baron |
purge: add -i flag to delete ignored files instead of untracked files
|
file |
diff |
annotate
|
| Wed, 05 Feb 2020 17:12:39 -0500 |
Augie Fackler |
merge: use manifestdict.walk() instead of manifestdict.matches()
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 14:47:38 -0800 |
Martin von Zweigbergk |
merge: introduce a revert_to() for that use-case
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 15:30:25 -0800 |
Martin von Zweigbergk |
merge: introduce a clean_update() for that use-case
|
file |
diff |
annotate
|
| Wed, 29 Jan 2020 11:30:16 -0800 |
Martin von Zweigbergk |
mergestate: add accessors for local and other nodeid, not just contexts
|
file |
diff |
annotate
|
| Tue, 28 Jan 2020 14:53:23 -0800 |
Martin von Zweigbergk |
graft: default `base` argument to common case of `ctx.p1()`
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 13:12:24 -0800 |
Martin von Zweigbergk |
graft: let caller pass in overlayworkingctx to merge.graft()
|
file |
diff |
annotate
|
| Thu, 23 Jan 2020 15:44:30 -0800 |
Martin von Zweigbergk |
merge: start using the per-side copy dicts
|
file |
diff |
annotate
|
| Wed, 22 Jan 2020 14:35:30 -0800 |
Martin von Zweigbergk |
copies: define a type to return from mergecopies()
|
file |
diff |
annotate
|
| Wed, 22 Jan 2020 16:45:56 -0800 |
Martin von Zweigbergk |
merge: move initialization of copy dicts to one place
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 15:12:50 -0800 |
Martin von Zweigbergk |
merge: avoid a negation in the definition of updatedirstate
|
file |
diff |
annotate
|
| Fri, 24 Jan 2020 08:32:35 -0800 |
Martin von Zweigbergk |
merge: move definition of `partial` closer to where it's used
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 15:08:42 -0800 |
Martin von Zweigbergk |
merge: define updatedirstate a little earlier and reuse it
|
file |
diff |
annotate
|
| Wed, 15 Jan 2020 15:07:43 -0800 |
Martin von Zweigbergk |
merge: don't call update hook when using in-memory context
|
file |
diff |
annotate
|
| Fri, 27 Dec 2019 13:47:59 -0800 |
Martin von Zweigbergk |
graftcopies: remove `skip` and `repo` arguments
|
file |
diff |
annotate
|
| Mon, 06 Jan 2020 15:24:36 -0800 |
Martin von Zweigbergk |
copies: replace duplicatecopies() by function that takes contexts
|
file |
diff |
annotate
|
| Fri, 27 Dec 2019 13:03:40 -0800 |
Martin von Zweigbergk |
graft: extract repo[None] to a variable
|
file |
diff |
annotate
|
| Mon, 13 Jan 2020 17:15:14 -0500 |
Augie Fackler |
core: migrate uses of hashlib.sha1 to hashutil.sha1
|
file |
diff |
annotate
|
| Thu, 05 Dec 2019 09:39:49 -0800 |
Martin von Zweigbergk |
graft: never set both parents equal in the dirstate (issue6098)
|
file |
diff |
annotate
|
| Thu, 05 Dec 2019 09:34:43 -0800 |
Martin von Zweigbergk |
graft: extract `repo['.']` to local variable
|
file |
diff |
annotate
|
| Thu, 05 Dec 2019 09:32:47 -0800 |
Martin von Zweigbergk |
graft: rename `pctx` argument to `base` since that's what it is
|
file |
diff |
annotate
|
| Sun, 01 Dec 2019 18:46:10 -0500 |
Matt Harbison |
cleanup: fix docstring formatting
|
file |
diff |
annotate
|
| Fri, 15 Nov 2019 15:36:09 -0800 |
Martin von Zweigbergk |
dirstate: include explicit matches in match.traversedir calls
|
file |
diff |
annotate
|
| Thu, 14 Nov 2019 08:03:26 -0800 |
Martin von Zweigbergk |
utils: move finddirs() to pathutil
|
file |
diff |
annotate
|
| Tue, 05 Nov 2019 08:42:42 -0800 |
Martin von Zweigbergk |
py3: don't use bytes with vars() or __dict__
stable
|
file |
diff |
annotate
|
| Tue, 08 Oct 2019 15:06:18 -0700 |
Martin von Zweigbergk |
cleanup: join string literals that are already on one line
|
file |
diff |
annotate
|
| Mon, 07 Oct 2019 00:04:04 -0400 |
Gregory Szorc |
py3: finish porting iteritems() to pycompat and remove source transformer
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 17:59:15 -0400 |
Gregory Szorc |
py3: define and use pycompat.itervalues()
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 16:58:55 -0400 |
Gregory Szorc |
py3: manually import pycompat.delattr where it is needed
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:48:39 -0400 |
Augie Fackler |
formatting: byteify all mercurial/ and hgext/ string literals
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 09:45:02 -0400 |
Augie Fackler |
formatting: blacken the codebase
|
file |
diff |
annotate
|