Mercurial > hg

log mercurial/merge.py @ 50825:973fbb27ab45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -120 tip
age author description
Thu, 02 Mar 2023 14:44:43 +0100 Pierre-Yves David branch: pass current transaction when writing branch in merge
Wed, 25 Jan 2023 19:12:31 +0100 Pierre-Yves David dirstate: rename parentchange to changing_parents
Wed, 25 Jan 2023 18:46:20 +0100 Pierre-Yves David dirstate: pass the repo to the `changeparent` method
Thu, 12 Jan 2023 13:14:00 +0000 Arseniy Alekseyev merge: add mergeresult.mapaction to improve speed
Wed, 04 Jan 2023 19:30:47 +0000 Arseniy Alekseyev merge: avoid dereferencing repo fields repeatedly
Fri, 06 Jan 2023 18:09:19 +0000 Arseniy Alekseyev merge: skip syntactic path checks in [_checkunknownfile]
Wed, 04 Jan 2023 17:14:33 +0000 Arseniy Alekseyev merge: cache the fs checks made during [_checkunknownfiles]
Wed, 04 Jan 2023 19:13:41 +0000 Arseniy Alekseyev merge: don't pay for pathconflicts if there are none
Fri, 06 Jan 2023 16:01:31 +0000 Arseniy Alekseyev debug: add a config to abort update early
Thu, 16 Jun 2022 15:20:48 +0200 Raphaël Gomès branching: merge stable into default
Tue, 14 Jun 2022 11:26:18 +0200 Pierre-Yves David purge: prevent a silly crash with --confirm --files stable 6.1.4
Tue, 31 May 2022 22:50:01 +0200 Manuel Jacob py3: catch FileNotFoundError instead of checking errno == ENOENT
Mon, 21 Feb 2022 13:08:28 -0700 Gregory Szorc py3: use class X: instead of class X(object):
Mon, 21 Feb 2022 11:11:59 -0700 Gregory Szorc merge: remove pycompat.iteritems()
Thu, 03 Mar 2022 18:28:30 -0800 Gregory Szorc global: bulk replace simple pycompat.iteritems(x) with x.items()
Thu, 03 Mar 2022 17:34:00 +0100 Gregory Szorc py2: remove simple from __future__ statements
Mon, 28 Feb 2022 18:34:23 +0100 Raphaël Gomès merge: remove direct rustmod reference stable 6.1
Tue, 18 Jan 2022 13:22:55 -0800 Martin von Zweigbergk merge: fix documented order of `labels` argument
Thu, 03 Feb 2022 18:14:25 +0100 Pierre-Yves David narrow: add support for merging add and remove outside of the tracked set
Thu, 03 Feb 2022 18:14:11 +0100 Pierre-Yves David narrow: allow merging non-conflicting change outside of the narrow spec
Sat, 29 Jan 2022 06:21:32 +0100 Pierre-Yves David merge-actions: have an attribute for narrow safetiness
Fri, 28 Jan 2022 15:19:58 +0100 Pierre-Yves David merge-actions: add an explicite "no_op" attribute
Fri, 28 Jan 2022 17:08:30 +0100 Pierre-Yves David merge-actions: make merge action a full featured object
Fri, 28 Jan 2022 16:41:45 +0100 Pierre-Yves David merge: stop using merge action for pathconflict option
Fri, 28 Jan 2022 14:25:51 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:25:45 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:25:39 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:25:32 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:25:05 +0100 Pierre-Yves David merge: break up two not-so-one-liner for extra readability
Fri, 28 Jan 2022 14:24:41 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:24:30 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:23:56 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:23:49 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Fri, 28 Jan 2022 14:23:37 +0100 Pierre-Yves David merge: break up a not-so-one-liner for readability
Tue, 18 Jan 2022 13:23:49 -0800 Martin von Zweigbergk update: set custom conflict label for base commit
Fri, 10 Dec 2021 17:20:21 +0100 Pierre-Yves David doc: remove a spurious ^L in some doc
Thu, 02 Dec 2021 22:59:36 -0800 Martin von Zweigbergk mergestate: merge `preresolve()` into `resolve()`
Fri, 26 Nov 2021 11:53:54 +0100 Raphaël Gomès typo: s/unkown/unknown across the codebase
Wed, 17 Nov 2021 10:22:15 +0100 Pierre-Yves David update: filter the ambiguous mtime in update directly
Wed, 17 Nov 2021 02:58:44 +0100 Pierre-Yves David dirstate: add a comment about a racy piece of code during updates
Fri, 19 Nov 2021 15:39:35 -0800 Martin von Zweigbergk errors: use detailed exit code when trying to merge file outside narrowspec
Thu, 21 Oct 2021 17:25:41 +0200 Raphaël Gomès branching: merge stable into default
Mon, 18 Oct 2021 11:23:07 +0200 Simon Sapin dirstate: store mtimes with nanosecond precision in memory
Tue, 19 Oct 2021 16:14:53 -0700 Kyle Lippincott merge-halt: fix issue with merge.on-failure=halt breaking unshelve stable
Thu, 08 Jul 2021 22:08:32 +0200 Pierre-Yves David sparse: adjust the temporary includes within a `parentchange` context
Tue, 01 Jun 2021 15:19:08 -0700 Martin von Zweigbergk merge: make applyupdates() not mutate mresult argument
Mon, 29 Mar 2021 01:52:06 +0200 Joerg Sonnenberger node: replace nullid and friends with nodeconstants class
Thu, 25 Mar 2021 18:02:08 +0100 Raphaël Gomès contributor: change mentions of mpm to olivia
Wed, 10 Mar 2021 13:14:32 +0530 Pulkit Goyal commit: get info from mergestate whether a file was merged or not
Thu, 18 Mar 2021 18:24:59 -0400 Matt Harbison merge with stable
Thu, 11 Mar 2021 18:33:39 -0500 Matt Harbison merge: force an exception message to bytes before printing as a warning stable
Fri, 29 Jan 2021 15:56:08 -0800 Martin von Zweigbergk errors: use StateError more in merge module
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
less more | (0) -120 tip