Mercurial > hg

log mercurial/merge.py @ 46367:57370e7deb7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -120 tip
age author description
Mon, 18 Jan 2021 10:24:11 +0100 Pierre-Yves David purge: also deal with directory with --confirm
Mon, 18 Jan 2021 10:24:03 +0100 Pierre-Yves David purge: add a --confirm option
Mon, 18 May 2020 17:29:53 -0400 Augie Fackler cleanup: use mergestate.unresolvedcount() instead of bool(list(unresolved()))
Fri, 27 Nov 2020 17:03:29 -0500 Augie Fackler formating: upgrade to black 20.8b1
Fri, 27 Nov 2020 16:59:14 -0500 Augie Fackler merge: remove spurious ' and trailing whitespace from triple-quoted string
Mon, 23 Nov 2020 23:08:58 -0800 Martin von Zweigbergk errors: raise StateError on uncommitted changes when merge starts
Mon, 22 Jun 2020 22:47:43 -0700 Martin von Zweigbergk copies: handle more cases where a file got replaced by a copy
Fri, 09 Oct 2020 09:17:47 -0700 Martin von Zweigbergk py3: convert an exception message to bytes
Mon, 14 Sep 2020 23:46:38 +0200 Pierre-Yves David salvaged: track removal-candidates in more cases
Fri, 02 Oct 2020 18:40:39 +0530 Pulkit Goyal merge: check for conflicting actions irrespective of length of bids
Wed, 30 Sep 2020 18:07:21 +0530 Pulkit Goyal merge: if CHANGED_DELETED and KEEP_NEW are actions, choose CHANGED_DELETED
Wed, 30 Sep 2020 15:46:54 +0530 Pulkit Goyal merge: if DELETED_CHANGED and GET are in actions, choose DELETED_CHANGED
Mon, 24 Aug 2020 15:35:34 +0530 Pulkit Goyal merge: store cases when a file is absent post merge in commitinfo
Thu, 03 Sep 2020 13:44:06 +0530 Pulkit Goyal merge: store commitinfo if these is a dc or cd conflict
Mon, 14 Sep 2020 14:40:12 +0530 Pulkit Goyal merge: disable `m2-vs-ma` optimization if new filenode config is true
Mon, 21 Sep 2020 09:57:29 -0700 Martin von Zweigbergk merge: add a higher-level update() for the common `hg update` use case
Mon, 21 Sep 2020 11:12:58 -0700 Martin von Zweigbergk merge: make low-level update() private (API)
Mon, 21 Sep 2020 09:56:48 -0700 Martin von Zweigbergk merge: add a back_out() function to encapsulate update()
Wed, 16 Sep 2020 18:09:32 +0530 Pulkit Goyal mergestate: define NO_OP_ACTION in module scope instead of inside mergeresult
Wed, 09 Sep 2020 16:49:19 +0530 Pulkit Goyal mergestate: introduce a new ACTION_KEEP_NEW
Thu, 17 Sep 2020 22:34:36 -0700 Martin von Zweigbergk mergedriver: delete it
Tue, 15 Sep 2020 16:10:16 -0700 Martin von Zweigbergk merge: use in-memory mergestate when using in-memory context
Thu, 17 Sep 2020 09:23:21 -0700 Martin von Zweigbergk mergestate: make clean() only be about creating a clean mergestate
Thu, 03 Sep 2020 13:25:29 +0530 Pulkit Goyal merge: move initial handling of mergeactions near to later one
Wed, 26 Aug 2020 16:37:23 +0530 Pulkit Goyal merge: update commitinfo from all mergeresults during bid merge
Mon, 24 Aug 2020 17:22:28 +0530 Pulkit Goyal merge: add missing ACTION_KEEP when both remote and ancestor are not present
Mon, 24 Aug 2020 15:20:09 +0530 Pulkit Goyal merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally
Tue, 01 Sep 2020 17:08:26 +0530 Pulkit Goyal merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent
Mon, 14 Sep 2020 13:51:39 +0530 Pulkit Goyal mergeresult: introduce dedicated tuple for no-op actions
Mon, 14 Sep 2020 11:32:24 -0400 Valentin Gatien-Baron fsmonitor: increase the threshold before we recommend it, when using rust
Wed, 26 Aug 2020 17:20:53 +0530 Pulkit Goyal merge: show list of bids for each file in bid-merge in ui.debug()
Wed, 26 Aug 2020 17:24:22 +0530 Pulkit Goyal merge: show number of ancestors in bid merge debug notes
Mon, 10 Aug 2020 15:47:21 +0530 Pulkit Goyal mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)
Mon, 10 Aug 2020 15:38:45 +0530 Pulkit Goyal merge: introduce `addcommitinfo()` on mergeresult object
Mon, 10 Aug 2020 15:34:27 +0530 Pulkit Goyal merge: use collections.defaultdict() for mergeresult.commitinfo
Thu, 06 Aug 2020 13:51:43 +0530 Pulkit Goyal merge: drop commitinfo argument to applyupdates (API)
Thu, 06 Aug 2020 13:27:38 +0530 Pulkit Goyal merge: remove emptyactions() and use collections.defaultdict(list) instead
Wed, 05 Aug 2020 16:52:51 +0530 Pulkit Goyal merge: pass mergeresult obj in _forgetremoved() (API)
Wed, 05 Aug 2020 16:00:25 +0530 Pulkit Goyal mergeresult: introduce filemap() which yields filename based mapping
Wed, 05 Aug 2020 15:41:23 +0530 Pulkit Goyal mergeresult: add `files()` and use it
Wed, 05 Aug 2020 15:37:26 +0530 Pulkit Goyal mergeresult: introduce getfile() and use it where required
Wed, 05 Aug 2020 14:03:59 +0530 Pulkit Goyal merge: use ACTION_* constants instead of values in _filternarrowactions()
Wed, 05 Aug 2020 13:50:49 +0530 Pulkit Goyal merge: rework iteration over mergeresult object in checkpathconflicts()
Wed, 05 Aug 2020 13:21:06 +0530 Pulkit Goyal applyupdates: simplfy calculation of number of updated files
Mon, 03 Aug 2020 18:08:37 +0530 Pulkit Goyal mergeresult: yield from getactions() instead of buidling a list and returning
Mon, 03 Aug 2020 17:58:18 +0530 Pulkit Goyal mergeresult: implement a len() function and use it
Mon, 03 Aug 2020 17:32:30 +0530 Pulkit Goyal merge: replace use of actions dict with mergeresult object
Mon, 03 Aug 2020 14:54:45 +0530 Pulkit Goyal mergeresult: add sort argument to getactions() method
Mon, 03 Aug 2020 14:19:06 +0530 Pulkit Goyal merge: pass mergeresult obj in merge._prefetchfiles()
Mon, 03 Aug 2020 14:12:13 +0530 Pulkit Goyal merge: pass mergeresult obj instead of actions in applyupdates() (API)
Mon, 03 Aug 2020 13:30:14 +0530 Pulkit Goyal merge: pass mergeresult obj instead of actions in _checkcollision() (API)
Sat, 25 Jul 2020 01:42:41 +0530 Pulkit Goyal mergeresult: make actionmapping a dict of dict instead of dict of lists
Sat, 25 Jul 2020 01:17:35 +0530 Pulkit Goyal merge: unify logic of couple of if-else's in manifestmerge()
Sun, 02 Aug 2020 10:24:28 -0700 Pulkit Goyal merge: use the new action based mapping introduced in mergeresult obj
Fri, 24 Jul 2020 19:48:38 +0530 Pulkit Goyal mergeresult: introduce action -> (filename, data, msg) mapping and related API
Sun, 02 Aug 2020 10:15:55 -0700 Pulkit Goyal mergeresult: rename _actions to _filemapping
Fri, 24 Jul 2020 19:19:47 +0530 Pulkit Goyal sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)
Fri, 24 Jul 2020 19:13:20 +0530 Pulkit Goyal merge: filter actions before calling _resolvetrivial()
Fri, 24 Jul 2020 18:16:29 +0530 Pulkit Goyal merge: introduce mergeresult.updateactions() and use it
Fri, 24 Jul 2020 17:57:23 +0530 Pulkit Goyal merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
Fri, 24 Jul 2020 17:52:33 +0530 Pulkit Goyal merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
Fri, 24 Jul 2020 17:49:13 +0530 Pulkit Goyal merge: pass mergeresult obj instead of actions in _filternarrowactions()
Fri, 24 Jul 2020 17:31:26 +0530 Pulkit Goyal merge: pass mergeresult in checkpassconflicts() instead of actions (API)
Fri, 24 Jul 2020 16:23:55 +0530 Pulkit Goyal merge: add removefile() to mergeresult object
Fri, 24 Jul 2020 16:18:39 +0530 Pulkit Goyal merge: introduce mergeresult.addfile() and use it
Fri, 24 Jul 2020 15:56:11 +0530 Pulkit Goyal merge: make mergeresult constructor initialize empty object
Fri, 24 Jul 2020 15:15:20 +0530 Pulkit Goyal merge: improve documentation of fbid dict used for merge bid
Fri, 24 Jul 2020 14:45:00 +0530 Pulkit Goyal merge: move conversion of file-key dict to action-key dict in mergeresult
Sun, 02 Aug 2020 10:12:21 -0700 Pulkit Goyal merge: introduce hasconflicts() on mergeresult object
Tue, 14 Jul 2020 16:40:28 +0530 Pulkit Goyal merge: remove no longer required ACTION_GET_OTHER_AND_STORE
Tue, 14 Jul 2020 16:31:52 +0530 Pulkit Goyal merge: pass commitinfo to applyupdates() and get it stored in mergestate
Tue, 14 Jul 2020 16:21:08 +0530 Pulkit Goyal merge: introduce 'commitinfo' in mergeresult
Thu, 23 Jul 2020 18:03:14 +0530 Pulkit Goyal merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)
Tue, 14 Jul 2020 15:42:28 +0530 Pulkit Goyal merge: document return values of manifestmerge() and calculateupdates()
Thu, 09 Jul 2020 19:02:10 +0530 Pulkit Goyal merge: refactor code to advise fsmonitor in separate function
Thu, 09 Jul 2020 14:44:58 +0530 Pulkit Goyal mergestate: rename addpath() -> addpathonflict() to prevent confusion
Mon, 06 Jul 2020 03:43:32 +0200 Joerg Sonnenberger manifest: tigher manifest parsing and flag use
Thu, 09 Jul 2020 18:48:55 -0700 Rodrigo Damazio Bovendorp scmutil: allowing different files to be prefetched per revision
Wed, 24 Jun 2020 23:17:56 -0700 Martin von Zweigbergk merge: don't grab wlock when merging in memory
Fri, 05 Jun 2020 11:10:33 -0700 Martin von Zweigbergk merge: move an inspection of the dirstate from record to calculate phase
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
Tue, 05 Nov 2019 08:42:42 -0800 Martin von Zweigbergk py3: don't use bytes with vars() or __dict__ stable
Tue, 08 Oct 2019 15:06:18 -0700 Martin von Zweigbergk cleanup: join string literals that are already on one line
Mon, 07 Oct 2019 00:04:04 -0400 Gregory Szorc py3: finish porting iteritems() to pycompat and remove source transformer
Sun, 06 Oct 2019 17:59:15 -0400 Gregory Szorc py3: define and use pycompat.itervalues()
Sun, 06 Oct 2019 16:58:55 -0400 Gregory Szorc py3: manually import pycompat.delattr where it is needed
Sun, 06 Oct 2019 09:48:39 -0400 Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals
Sun, 06 Oct 2019 09:45:02 -0400 Augie Fackler formatting: blacken the codebase
Wed, 25 Sep 2019 11:04:08 -0400 Augie Fackler merge: check argument value with if/raise instead of an assert
Wed, 25 Sep 2019 10:53:10 -0400 Augie Fackler merge: replace magic strings with NAMED_CONSTANTS (API)
Mon, 23 Sep 2019 21:29:53 +0900 Yuya Nishihara merge with stable
less more | (0) -120 tip