| Fri, 28 Jan 2022 17:08:30 +0100 |
Pierre-Yves David |
merge-actions: make merge action a full featured object
|
file |
diff |
annotate
|
| Fri, 28 Jan 2022 16:11:42 +0100 |
Pierre-Yves David |
large-file: use the merge action constant
|
file |
diff |
annotate
|
| Tue, 07 Dec 2021 21:17:18 -0800 |
Martin von Zweigbergk |
filemerge: stop returning always-`True` value
|
file |
diff |
annotate
|
| Fri, 03 Dec 2021 22:45:35 -0800 |
Martin von Zweigbergk |
filemerge: inline `_filemerge()` into `filemerge()`
|
file |
diff |
annotate
|
| Fri, 03 Dec 2021 21:41:43 -0800 |
Martin von Zweigbergk |
filemerge: make `_filemerge()` do both premerge and merge
|
file |
diff |
annotate
|
| Thu, 18 Nov 2021 13:12:40 +0100 |
Pierre-Yves David |
status: use filesystem time boundary to invalidate racy mtime
|
file |
diff |
annotate
|
| Mon, 19 Jul 2021 04:13:50 +0530 |
Pulkit Goyal |
largefiles: partially undo 61e526585b20e2ff15f19497d0451d18fea02db8 and child
|
file |
diff |
annotate
|
| Mon, 19 Jul 2021 04:11:08 +0530 |
Pulkit Goyal |
largefiles: pass current transaction to `lfdirstate.write()`
|
file |
diff |
annotate
|
| Tue, 28 Sep 2021 15:11:22 -0700 |
Martin von Zweigbergk |
errors: raise InputError from revsingle() iff revset provided by the user
|
file |
diff |
annotate
|
| Tue, 28 Sep 2021 08:47:11 -0700 |
Martin von Zweigbergk |
errors: raise InputError on bad revset to revrange() iff provided by the user
|
file |
diff |
annotate
|
| Wed, 29 Sep 2021 18:39:02 +0200 |
Pierre-Yves David |
dirstate-item: use item's property instead of `state` in largefile
|
file |
diff |
annotate
|
| Tue, 28 Sep 2021 18:57:20 +0200 |
Pierre-Yves David |
dirstate: drop some safety assert in largefile
|
file |
diff |
annotate
|
| Mon, 19 Jul 2021 03:19:06 +0200 |
Pierre-Yves David |
largefile: use `update_file` instead of `add` in `mergerecordupdates`
|
file |
diff |
annotate
|
| Mon, 19 Jul 2021 09:15:37 +0200 |
Pierre-Yves David |
largefile: use `update_file` instead of `drop` during `rollback`
|
file |
diff |
annotate
|
| Sun, 18 Jul 2021 23:43:08 +0200 |
Pierre-Yves David |
largefile: use `set_possibly_dirty` instead of `normallookup`
|
file |
diff |
annotate
|
| Mon, 19 Jul 2021 00:04:24 +0200 |
Pierre-Yves David |
largefile: use `update_file` instead of `normal`
|
file |
diff |
annotate
|
| Mon, 19 Jul 2021 00:05:47 +0200 |
Pierre-Yves David |
largefile: adjust the dirstate post update within a `parentchange` context
|
file |
diff |
annotate
|
| Mon, 19 Jul 2021 03:20:04 +0200 |
Pierre-Yves David |
largefile: use `update_file` instead of `remove` in `mergerecordupdates`
|
file |
diff |
annotate
|
| Thu, 08 Jul 2021 03:54:54 +0200 |
Pierre-Yves David |
largefile: use `set_untracked` in the override of copy/rename
|
file |
diff |
annotate
|
| Thu, 08 Jul 2021 03:50:08 +0200 |
Pierre-Yves David |
largefile: use `set_untracked` in the `forget` override
|
file |
diff |
annotate
|
| Thu, 08 Jul 2021 03:33:56 +0200 |
Pierre-Yves David |
largefile: directly use set_untracked() for removing files
|
file |
diff |
annotate
|
| Thu, 08 Jul 2021 01:47:41 +0200 |
Pierre-Yves David |
largefile: use `parentchange` during rollback
|
file |
diff |
annotate
|
| Thu, 08 Jul 2021 01:24:29 +0200 |
Pierre-Yves David |
largefile: use `set_tracked` in the `hg copy` overwrite
|
file |
diff |
annotate
|
| Thu, 08 Jul 2021 01:24:11 +0200 |
Pierre-Yves David |
largefile: use parentchange during mergerecordupdates
|
file |
diff |
annotate
|
| Thu, 08 Jul 2021 01:23:30 +0200 |
Pierre-Yves David |
largefile: use `set_tracked` in the `hg add` overwrite
|
file |
diff |
annotate
|
| Thu, 11 Feb 2021 20:36:46 -0800 |
Martin von Zweigbergk |
branching: merge with stable
|
file |
diff |
annotate
|
| Thu, 04 Feb 2021 16:59:46 -0500 |
Jordi Gutiérrez Hermoso |
largefiles: properly pass kwargs into url.open
stable
|
file |
diff |
annotate
|
| Mon, 18 Jan 2021 10:24:20 +0100 |
Valentin Gatien-Baron |
purge: move extension into core mercurial
|
file |
diff |
annotate
|
| Tue, 01 Dec 2020 15:11:06 +0100 |
Pierre-Yves David |
upgrade: split definition and management of the actions from the main code
|
file |
diff |
annotate
|
| Fri, 27 Nov 2020 17:03:29 -0500 |
Augie Fackler |
formating: upgrade to black 20.8b1
|
file |
diff |
annotate
|
| Thu, 08 Oct 2020 13:37:31 -0700 |
Martin von Zweigbergk |
errors: name arguments to Abort constructor
|
file |
diff |
annotate
|
| Mon, 21 Sep 2020 11:12:58 -0700 |
Martin von Zweigbergk |
merge: make low-level update() private (API)
|
file |
diff |
annotate
|
| Tue, 22 Sep 2020 23:18:37 -0700 |
Martin von Zweigbergk |
largefiles: prevent in-memory merge instead of switching to on-disk
|
file |
diff |
annotate
|
| Fri, 11 Sep 2020 10:47:17 +0900 |
Yuya Nishihara |
largefiles: remove unused 'rev' parameter from downloadlfiles()
|
file |
diff |
annotate
|
| Mon, 10 Aug 2020 21:46:47 -0700 |
Martin von Zweigbergk |
revert: remove dangerous `parents` argument from `cmdutil.revert()`
|
file |
diff |
annotate
|
| Thu, 06 Aug 2020 13:27:38 +0530 |
Pulkit Goyal |
merge: remove emptyactions() and use collections.defaultdict(list) instead
|
file |
diff |
annotate
|
| Wed, 05 Aug 2020 15:41:23 +0530 |
Pulkit Goyal |
mergeresult: add `files()` and use it
|
file |
diff |
annotate
|
| Wed, 05 Aug 2020 15:37:26 +0530 |
Pulkit Goyal |
mergeresult: introduce getfile() and use it where required
|
file |
diff |
annotate
|
| Sat, 25 Jul 2020 14:44:29 +0530 |
Pulkit Goyal |
largefiles: introduce a constant for 'lfmr' action
|
file |
diff |
annotate
|
| Sat, 25 Jul 2020 14:41:20 +0530 |
Pulkit Goyal |
largefiles: override merge.emptyactions() to include `lfmr`
|
file |
diff |
annotate
|
| Fri, 24 Jul 2020 16:18:39 +0530 |
Pulkit Goyal |
merge: introduce mergeresult.addfile() and use it
|
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
|
| Mon, 18 May 2020 14:59:59 -0400 |
Augie Fackler |
mergestate: split out merge state handling code from main merge module
|
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
|
| Tue, 21 Jan 2020 13:14:51 -0500 |
Augie Fackler |
merge to stable for 5.3 release freeze
stable 5.3rc0
|
file |
diff |
annotate
|
| Tue, 24 Dec 2019 01:38:02 -0500 |
Matt Harbison |
subrepo: fix a crash when archiving an svn or git subrepo
stable
|
file |
diff |
annotate
|
| Fri, 18 Oct 2019 17:46:37 -0700 |
Martin von Zweigbergk |
largefiles: move lfstatus context manager to lfutil
|
file |
diff |
annotate
|
| Fri, 08 Nov 2019 11:19:20 -0800 |
Augie Fackler |
cleanup: remove pointless r-prefixes on single-quoted strings
|
file |
diff |
annotate
|
| Fri, 18 Oct 2019 15:16:57 -0700 |
Martin von Zweigbergk |
largefiles: use context manager for setting "lfstatus" on subrepos too
|
file |
diff |
annotate
|
| Fri, 18 Oct 2019 15:14:51 -0700 |
Martin von Zweigbergk |
largefiles: reset "lfstatus" attribute to previous value in "finally"
|
file |
diff |
annotate
|
| Fri, 18 Oct 2019 14:40:50 -0700 |
Martin von Zweigbergk |
largefiles: add context manager for setting/clearing "lfstatus" attribute
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 19:25:18 -0400 |
Gregory Szorc |
py3: define and use pycompat.iteritems() for hgext/
|
file |
diff |
annotate
|
| Sun, 06 Oct 2019 13:28:56 -0400 |
Gregory Szorc |
py3: manually import pycompat.open into files that need it
|
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
|
| Wed, 10 Jul 2019 09:57:28 +0200 |
Raphaël Gomès |
rust-dirstate: call rust dirstatemap from Python
|
file |
diff |
annotate
|
| Mon, 24 Jun 2019 16:00:39 -0700 |
Kyle Lippincott |
largefiles: make last line of prompts <40 english chars (issue6158)
|
file |
diff |
annotate
|
| Mon, 27 May 2019 16:55:46 -0400 |
Valentin Gatien-Baron |
merge: fix race that could cause wrong size in dirstate
|
file |
diff |
annotate
|
| Wed, 20 Feb 2019 18:02:28 -0500 |
Augie Fackler |
cleanup: prefer nested context managers to \-continuations
|
file |
diff |
annotate
|
| Sat, 09 Feb 2019 22:50:53 -0800 |
Martin von Zweigbergk |
match: delete unused root and cwd arguments from {always,never,exact}() (API)
|
file |
diff |
annotate
|