Thu, 17 Sep 2020 23:09:47 -0700 |
Martin von Zweigbergk |
mergestate: move commit() from base class to on-disk subclass
|
Thu, 17 Sep 2020 23:12:48 -0700 |
Martin von Zweigbergk |
mergestate: make in-memory mergestate not clear on-disk mergestate on reset()
|
Tue, 15 Sep 2020 16:10:16 -0700 |
Martin von Zweigbergk |
merge: use in-memory mergestate when using in-memory context
|
Tue, 15 Sep 2020 11:17:24 -0700 |
Martin von Zweigbergk |
mergestate: extract a base class to be shared by future memmergestate
|
Tue, 15 Sep 2020 11:33:26 -0700 |
Martin von Zweigbergk |
mergestate: extract overridable methods for making/restoring file backups
|
Wed, 16 Sep 2020 13:39:26 -0700 |
Martin von Zweigbergk |
mergestate: initialize all properties in __init__()
|
Thu, 17 Sep 2020 19:33:55 -0700 |
Martin von Zweigbergk |
mergestate: remove unnecessary clearing of `localctx` and `otherctx`
|
Wed, 16 Sep 2020 13:25:49 -0700 |
Martin von Zweigbergk |
mergestate: move most of of reset() into start()
|
Thu, 17 Sep 2020 09:23:21 -0700 |
Martin von Zweigbergk |
mergestate: make clean() only be about creating a clean mergestate
|
Wed, 16 Sep 2020 10:09:37 -0700 |
Martin von Zweigbergk |
mergestate: split up reset() for its two use cases
|
Tue, 15 Sep 2020 23:19:14 -0700 |
Martin von Zweigbergk |
mergestate: simplify reset(), knowing that `other` and `node` go together
|
Tue, 15 Sep 2020 22:40:26 -0700 |
Martin von Zweigbergk |
mergestate: make some callers not pass pointless node argument
|
Thu, 17 Sep 2020 09:56:05 -0700 |
Martin von Zweigbergk |
py3: don't risk passing a None value to error.ManifestLookupError()
|
Thu, 03 Sep 2020 13:25:29 +0530 |
Pulkit Goyal |
merge: move initial handling of mergeactions near to later one
|
Thu, 25 Jun 2020 13:16:55 +0530 |
Pulkit Goyal |
upgrade: support running upgrade if repository has share-safe requirement
|
Thu, 17 Sep 2020 18:49:57 -0700 |
Pulkit Goyal |
config: add `--shared` flag to edit config file of shared source
|
Thu, 02 Jul 2020 16:23:36 +0530 |
Pulkit Goyal |
localrepo: load the share source .hg/hgrc also in share-safe mode (API)
|
Fri, 07 Aug 2020 17:42:15 +0530 |
Pulkit Goyal |
helptext: document exp-sharesafe in internals/requirements.txt
|
Tue, 14 Apr 2020 21:07:09 +0530 |
Pulkit Goyal |
share: introduce config option to store requires in .hg/store
|
Fri, 07 Aug 2020 16:11:19 +0530 |
Pulkit Goyal |
scmutil: introduce filterrequirements() to split reqs into wc and store ones
|
Thu, 17 Sep 2020 18:28:53 -0700 |
Pulkit Goyal |
remotefilelog: acquire lock before writing requirements on clone
|
Thu, 10 Sep 2020 14:23:12 +0900 |
Yuya Nishihara |
grep: make -frREV follow history from the specified revision (BC)
|
Fri, 11 Sep 2020 18:33:41 +0900 |
Yuya Nishihara |
cmdutil: make walkchangerevs() gracefully handle wdir parents
|
Thu, 10 Sep 2020 13:30:34 +0900 |
Yuya Nishihara |
grep: fix --follow with no --diff nor --rev to not fall back to plain grep
|
Fri, 11 Sep 2020 12:39:45 +0900 |
Yuya Nishihara |
test-grep: add tests for --follow with/without --diff and/or paths
|
Thu, 10 Sep 2020 13:10:53 +0900 |
Yuya Nishihara |
grep: clarify that --all works exactly the same way as --diff
|
Thu, 17 Sep 2020 15:34:13 +0200 |
Stephane |
churn: add an usage example in docstring
|
Thu, 17 Sep 2020 15:47:19 +0530 |
Pulkit Goyal |
tests: run test-check-py3-compat only in pure python mode
|
Sat, 12 Sep 2020 07:23:47 +0900 |
Yuya Nishihara |
log: make -frREV PATH detect missing files before falling back to slow path
|
Fri, 11 Sep 2020 15:13:35 +0900 |
Yuya Nishihara |
log: fix -fr'wdir()' PATH to follow newly added file
|
Fri, 11 Sep 2020 15:08:58 +0900 |
Yuya Nishihara |
log: reorganize if-else and for loop in logcmdutil._makematcher()
|
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
|
Fri, 19 Jun 2020 13:27:46 +0200 |
Pierre-Yves David |
tests: add criss cross merging tests whose behavior need to be fixed
|
Fri, 11 Sep 2020 15:52:06 -0700 |
Kyle Lippincott |
repo: avoid copying/updating a dict on every `repo.__getitem__`
|
Thu, 23 Jul 2020 20:23:44 +0200 |
Joerg Sonnenberger |
obsstore: refactor v1 logic to fix 32 byte hash support
|
Mon, 14 Sep 2020 11:32:24 -0400 |
Valentin Gatien-Baron |
fsmonitor: increase the threshold before we recommend it, when using rust
|
Fri, 19 Jun 2020 06:15:06 +0200 |
Pierre-Yves David |
copy-tracing: test case where a merge reverted a file deletion
|
Fri, 19 Jun 2020 06:04:48 +0200 |
Pierre-Yves David |
copy-tracing: test case where we go across a changed/deleted merge
|
Wed, 26 Aug 2020 17:20:53 +0530 |
Pulkit Goyal |
merge: show list of bids for each file in bid-merge in ui.debug()
|
Mon, 14 Sep 2020 19:39:51 +0900 |
Yuya Nishihara |
merge with stable
|
Sun, 13 Sep 2020 17:52:24 +0900 |
Yuya Nishihara |
cmdutil: reimplement finddate() without using walkchangerevs()
|
Sun, 13 Sep 2020 18:14:51 +0900 |
Yuya Nishihara |
test-simple-update: add test for -d DATE option
|
Sun, 13 Sep 2020 17:46:48 +0900 |
Yuya Nishihara |
largefiles: walk history in ascending order while downloading all lfiles
|
Sun, 13 Sep 2020 17:43:19 +0900 |
Yuya Nishihara |
largefiles: replace use of walkchangerevs() with simple revset query
|
Fri, 11 Sep 2020 10:47:17 +0900 |
Yuya Nishihara |
largefiles: remove unused 'rev' parameter from downloadlfiles()
|
Sat, 12 Sep 2020 11:18:12 -0700 |
Martin von Zweigbergk |
resourceutil: document when we expect to take the importlib.resouces code path
|
Thu, 10 Sep 2020 22:00:00 -0700 |
Martin von Zweigbergk |
templater: fix reading of templates in frozen binaries with py3 < 3.7
|
Fri, 11 Sep 2020 09:35:49 -0700 |
Martin von Zweigbergk |
histedit: cache description line
|
Fri, 11 Sep 2020 09:55:08 -0700 |
Martin von Zweigbergk |
tests: make emacs test less strict
|
Thu, 10 Sep 2020 13:12:34 -0700 |
Martin von Zweigbergk |
graphlog: use '%' only if there are *unresolved* conflicts
|
Wed, 26 Aug 2020 17:24:22 +0530 |
Pulkit Goyal |
merge: show number of ancestors in bid merge debug notes
|
Thu, 03 Sep 2020 14:45:16 +0530 |
Pulkit Goyal |
debugmergestate: sort extras before printing
|
Mon, 24 Aug 2020 18:59:19 +0530 |
Pulkit Goyal |
debugmergestate: show extras for files which are not in mergestate
|
Thu, 10 Sep 2020 16:51:40 +0530 |
Pulkit Goyal |
tests: update lockdelay.py to handle the `wait` argument
|
Thu, 03 Sep 2020 14:14:04 +0530 |
Pulkit Goyal |
commit: pass mergestate into _filecommit() instead of re-reading it
|
Fri, 11 Sep 2020 13:04:05 +0530 |
Sushil khanchi |
py3: fix bytes and str mixup in run-tests
|
Mon, 17 Aug 2020 10:59:30 +0200 |
Antoine Cezar |
hg-core: fix some `clippy` warnings
|
Mon, 17 Aug 2020 16:55:43 +0200 |
Antoine Cezar |
rhg: print error message when argument parsing fails
|
Thu, 13 Aug 2020 16:36:42 +0200 |
Antoine Cezar |
rhg: fix `clippy` warnings
|
Tue, 04 Aug 2020 16:11:23 +0200 |
Antoine Cezar |
rhg: pass `ui` to `Command` `run`
|
Mon, 03 Aug 2020 11:55:59 +0200 |
Antoine Cezar |
rhg: add harness tests for rhg files
|
Thu, 30 Jul 2020 16:55:44 +0200 |
Raphaël Gomès |
rhg: make output of `files` relative to the current directory and the root
|
Tue, 08 Sep 2020 19:36:40 +0530 |
Pulkit Goyal |
tags: take lock instead of wlock before writing hgtagsfnodes1 cache
|
Thu, 10 Sep 2020 13:37:35 +0530 |
Pulkit Goyal |
statichttprepo: use LockUnavailable() instead of Abort() for lock (API)
|
Tue, 08 Sep 2020 18:46:01 +0530 |
Pulkit Goyal |
localrepo: warn if we are writing to cache without a lock
|
Thu, 03 Sep 2020 14:14:40 +0530 |
Pulkit Goyal |
commit: fix a wrong argument name in documentation
|
Thu, 10 Sep 2020 17:03:38 +0530 |
Pulkit Goyal |
git: remove unrequired assignment of listignored and listunknown
|
Wed, 09 Sep 2020 11:41:18 +0900 |
Yuya Nishihara |
grep: fix hash(linestate) to not include linenum
|
Tue, 08 Sep 2020 21:38:10 +0900 |
Yuya Nishihara |
test-grep: document that trivially moved lines might not be detected
|
Wed, 09 Sep 2020 11:51:51 +0900 |
Yuya Nishihara |
revset: remove indirect indexing of status tuple
|
Tue, 25 Aug 2020 23:18:42 -0400 |
Matt Harbison |
rewriteutil: relax the sha1 hash references to handle future hash types
|
Mon, 24 Aug 2020 18:51:25 -0400 |
Matt Harbison |
phabricator: update the hashes in commit messages as they get submitted
|
Mon, 24 Aug 2020 18:44:15 -0400 |
Matt Harbison |
rewriteutil: also consider pending obsoletes when updating hashes in messages
|
Mon, 24 Aug 2020 12:43:53 -0400 |
Matt Harbison |
rewriteutil: extract evolve code used to replace obsolete hashes in commits
|
Mon, 07 Sep 2020 17:16:16 -0400 |
Augie Fackler |
git: fix index handling of removed files during commit (issue6398)
|
Mon, 07 Sep 2020 17:14:59 -0400 |
Augie Fackler |
git: make dirstate actually support listclean parameter
|
Mon, 07 Sep 2020 17:13:45 -0400 |
Augie Fackler |
git: make dirstate status() respect matcher
|
Mon, 07 Sep 2020 17:12:29 -0400 |
Augie Fackler |
git: fix up dirstate use of index
|
Mon, 07 Sep 2020 16:27:12 -0400 |
Augie Fackler |
git: correctly handle "nothing changed" commits
|
Mon, 07 Sep 2020 16:25:16 -0400 |
Augie Fackler |
localrepo: use functools.wraps() in unfilteredmethod decorator
|
Mon, 07 Sep 2020 16:13:10 -0400 |
Augie Fackler |
git: actually copy treemanifest instances in .copy() (issue6398)
|
Fri, 11 Sep 2020 14:41:05 +0900 |
Yuya Nishihara |
log: fix crash and bad filematcher lookup by -fr'wdir()' PATH
stable
|
Wed, 09 Sep 2020 14:48:55 -0400 |
Augie Fackler |
hgdemandimport: bypass demandimport for _ast module (issue6407)
stable
|
Mon, 07 Sep 2020 15:46:56 -0400 |
Augie Fackler |
git: restore basic functionality after b3040b6739ce
|
Mon, 07 Sep 2020 15:31:34 -0400 |
Augie Fackler |
git: convert tz offset to int (issue6359)
|
Fri, 04 Sep 2020 15:21:02 -0400 |
Matt Harbison |
repoview: pin revisions for `local` and `other` when a merge is active
stable
|
Mon, 07 Sep 2020 15:20:31 -0400 |
Augie Fackler |
merge with stable
|
Wed, 02 Sep 2020 19:46:55 +0530 |
Pulkit Goyal |
extdiff: refactor cmdline and gui calculation login in a separate fn
|
Wed, 02 Sep 2020 19:17:31 +0530 |
Pulkit Goyal |
extdiff: reorder an if-else conditional
|
Wed, 02 Sep 2020 23:09:45 +0530 |
Sushil khanchi |
run-tests: extract logic to get errpath in a utility func
|
Sat, 22 Aug 2020 16:31:34 +0530 |
Sushil khanchi |
run-tests: refactor filtering logic for --retest flag
|
Thu, 27 Aug 2020 12:24:57 +0530 |
Sushil khanchi |
tests: add a --retest test to demonstrate a fix in next patch
|
Thu, 27 Aug 2020 12:21:24 +0530 |
Sushil khanchi |
tests: remove a sub-test since we are done with it in test-run-tests.t
|
Tue, 21 Jul 2020 22:41:45 +0200 |
Joerg Sonnenberger |
storageutil: allow modern hash sizes for fileids
|
Tue, 01 Sep 2020 22:28:41 -0400 |
Matt Harbison |
registrar: fix a documentation typo
|
Mon, 10 Aug 2020 15:50:22 +0200 |
Antoine Cezar |
documentation: add `zstd` compression to the internal `revlogs` documentation
|
Sat, 29 Aug 2020 14:35:18 +0530 |
Pulkit Goyal |
extdiff: move single file handling inside `not per-file` conditional
|
Sat, 29 Aug 2020 14:32:26 +0530 |
Pulkit Goyal |
extdiff: remove dir2root and pass full path as dir2 in _runperfilediff()
|
Sat, 29 Aug 2020 14:28:34 +0530 |
Pulkit Goyal |
extdiff: pass full paths of `dir1a` and `dir1b` to `_runperfilediff()`
|
Wed, 02 Sep 2020 12:31:37 +0200 |
Harald Klimach |
hgweb: compatibility of hgweb.cgi template with Python 3
stable
|
Tue, 01 Sep 2020 10:33:10 -0400 |
Augie Fackler |
genosxversion: don't give up if we can't find a path to hg libraries
stable
|
Wed, 02 Sep 2020 01:30:56 +0200 |
Manuel Jacob |
tests: fix test-demandimport.py on Python 3.9
stable
|
Tue, 01 Sep 2020 09:46:15 -0400 |
Augie Fackler |
merge with stable
|
Tue, 01 Sep 2020 16:27:25 +0530 |
Pulkit Goyal |
Added signature for changeset f62bb5d07848
stable
|
Tue, 01 Sep 2020 16:27:18 +0530 |
Pulkit Goyal |
Added tag 5.5.1 for changeset f62bb5d07848
stable
|
Mon, 24 Aug 2020 12:39:48 -0400 |
Matt Harbison |
mercurial: force LF endings for *.py, *.{c,h} and *.t in .editorconfig
|
Tue, 18 Aug 2020 22:21:00 +0800 |
Aay Jay Chan |
hooklib: update documentation of changeset_obsoletedfor for changed hook type
|
Fri, 14 Aug 2020 20:45:49 -0700 |
Martin von Zweigbergk |
worker: don't expose readinto() on _blockingreader since pickle is picky
|
Thu, 27 Aug 2020 09:06:35 +0200 |
Pierre-Yves David |
test: add `test-repo` requirement to `test-check-format` (issue6395)
stable 5.5.1
|
Tue, 18 Aug 2020 15:03:57 -0700 |
Martin von Zweigbergk |
commit: clear mergestate also with --amend (issue6304)
|
Tue, 18 Aug 2020 14:26:49 -0700 |
Martin von Zweigbergk |
tests: add test showing that merge state is not cleared by amend
|
Tue, 11 Aug 2020 13:43:43 +0530 |
Pulkit Goyal |
requirements: introduce constants for `shared` and `relshared` requirements
|
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
|
Mon, 10 Aug 2020 15:29:02 +0530 |
Pulkit Goyal |
mergestate: use _stateextras instead of merge records for commit related info
|
Mon, 10 Aug 2020 15:09:44 +0530 |
Pulkit Goyal |
mergestate: use collections.defaultdict(dict) for _stateextras
|
Mon, 03 Aug 2020 23:41:50 -0700 |
Martin von Zweigbergk |
hgweb: minimize scope of a try-block in staticfile()
|
Mon, 03 Aug 2020 23:38:50 -0700 |
Martin von Zweigbergk |
hgweb: ignore web.templates config when guessing mime type for static content
|
Sat, 22 Aug 2020 16:03:44 -0700 |
Martin von Zweigbergk |
hgweb: let staticfile() look up path from default location unless provided
|
Mon, 03 Aug 2020 22:40:05 -0700 |
Martin von Zweigbergk |
hgweb: handle None from templatedir() equally bad in webcommands.py
|
Thu, 13 Aug 2020 10:37:25 -0700 |
Martin von Zweigbergk |
posixworker: avoid creating workers that end up getting no work
|
Mon, 10 Aug 2020 21:46:47 -0700 |
Martin von Zweigbergk |
revert: remove dangerous `parents` argument from `cmdutil.revert()`
|
Mon, 10 Aug 2020 18:08:15 -0700 |
Pulkit Goyal |
requirements: introduce a set of working directory specific requirements
|
Sat, 08 Aug 2020 16:37:59 +0530 |
Pulkit Goyal |
localrepo: move requirements constant to requirements module
|
Sat, 08 Aug 2020 16:24:12 +0530 |
Pulkit Goyal |
requirements: introduce new requirements related module
|
Sat, 08 Aug 2020 15:48:17 +0530 |
Pulkit Goyal |
repository: introduce constant for treemanifest requirement and use it
|
Tue, 21 Jul 2020 22:13:54 +0200 |
Joerg Sonnenberger |
tests: make flag parsing test more future safe
|
Tue, 28 Jul 2020 09:58:28 -0700 |
Martin von Zweigbergk |
rename: add support for --at-rev, which marks as copy and removes the source
|
Fri, 24 Jul 2020 15:03:14 -0700 |
Kyle Lippincott |
tests: make test-install.t work on debian systems
|
Fri, 24 Jul 2020 10:34:04 +0200 |
Antoine Cezar |
rhg: handle broken pipe error for stderr
|
Fri, 24 Jul 2020 17:24:10 +0200 |
Antoine Cezar |
rhg: extract function handle_stdout_error
|
Fri, 17 Jul 2020 17:24:54 +0200 |
Antoine Cezar |
rhg: add a limited `rhg files` subcommand
|
Wed, 29 Jul 2020 10:21:17 +0200 |
Antoine Cezar |
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand
|
Wed, 29 Jul 2020 15:49:44 +0200 |
Antoine Cezar |
rhg: simplify `FindRootError` handling
|
Wed, 29 Jul 2020 10:26:17 +0200 |
Antoine Cezar |
rhg: add buffered stdout writing possibility
|
Mon, 20 Jul 2020 18:14:52 +0200 |
Antoine Cezar |
rhg: ask the error message from `CommandError`
|
Tue, 21 Jul 2020 10:39:30 +0200 |
Antoine Cezar |
rhg: Do not return error when when we really mean ok in commands
|
Sat, 08 Aug 2020 12:52:39 -0700 |
Antoine Cezar |
hg-core: define a `ListTrackedFiles` `Operation`
|
Wed, 29 Jul 2020 10:08:09 +0200 |
Antoine Cezar |
hg-core: remove the `Operation` trait
|
Tue, 04 Aug 2020 10:59:43 +0200 |
Antoine Cezar |
hg-core: make parse_dirstate return references rather than update hashmaps
|
Fri, 07 Aug 2020 18:01:48 +0530 |
Pulkit Goyal |
repository: introduce constant for internal phase repo requirement and use it
|
Sat, 08 Aug 2020 10:06:32 -0700 |
Pulkit Goyal |
repository: introduce constant for sparse repo requirement and use it
|
Fri, 07 Aug 2020 16:02:13 +0530 |
Pulkit Goyal |
localrepo: refactor `.hg/requires` reading logic in separate function
|
Fri, 07 Aug 2020 15:52:52 +0530 |
Pulkit Goyal |
localrepo: refactor logic to calculate sharedvfs in separate fn
|
Sun, 02 Aug 2020 17:40:35 +0200 |
Cédric Krier |
keepalive: Do not append _rbuf if _raw_readinto exists (issue6356)
stable
|
Sat, 08 Aug 2020 10:13:37 -0700 |
Pulkit Goyal |
store: refactor space delimited list to proper data structure
|
Fri, 07 Aug 2020 21:59:43 -0700 |
Martin von Zweigbergk |
makefile: stop setting unused HGEXTDIR variable during osx build
|
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 18:33:00 +0530 |
Pulkit Goyal |
sparse: replace merge action values with mergestate.ACTION_* constants
|
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)
|
Tue, 28 Jul 2020 20:21:06 +0200 |
Pierre-Yves David |
commitctx: directly update the touched and added set of files
|
Tue, 28 Jul 2020 20:19:09 +0200 |
Pierre-Yves David |
commitctx: directly updated the set of removed files
|
Wed, 29 Jul 2020 16:48:31 +0200 |
Pierre-Yves David |
commitctx: create the `ChangingFiles` object sooner
|
Sat, 25 Jul 2020 16:34:02 +0200 |
Pierre-Yves David |
commitctx: move ChangingFiles creation directly inside `_process_files`
|
Sat, 25 Jul 2020 16:13:32 +0200 |
Pierre-Yves David |
commitctx: create the ChangingFiles object directly in the various case
|
Sat, 25 Jul 2020 16:13:17 +0200 |
Pierre-Yves David |
commitctx: no longer make the storage and added/removed file optional
|
Sat, 25 Jul 2020 16:07:38 +0200 |
Pierre-Yves David |
commitctx: directly gather p1 and p2 copies in `files`
|
Sat, 25 Jul 2020 16:02:26 +0200 |
Pierre-Yves David |
commitctx: extract sidedata encoding inside its own function
|
Sat, 25 Jul 2020 15:55:09 +0200 |
Pierre-Yves David |
commitctx: directly pass a ChangingFiles object to changelog.add
|
Sat, 25 Jul 2020 15:49:12 +0200 |
Pierre-Yves David |
commitctx: return a richer object from _prepare_files
|
Thu, 06 Aug 2020 10:53:00 -0700 |
Martin von Zweigbergk |
templater: teach template loader to use open_template() function
|
Thu, 06 Aug 2020 10:52:52 -0700 |
Martin von Zweigbergk |
templater: restructure open_template() a little to prepare for relative paths
|
Thu, 06 Aug 2020 09:50:10 -0700 |
Martin von Zweigbergk |
templater: add exception-raising version of open_template()
|
Wed, 05 Aug 2020 22:13:51 -0700 |
Martin von Zweigbergk |
templater: replace Py3-only exception types by super-types available in Py2
|
Wed, 05 Aug 2020 14:19:42 -0700 |
Martin von Zweigbergk |
hgweb: enable reading styles from resources in frozen binaries
|
Wed, 05 Aug 2020 14:03:45 -0700 |
Martin von Zweigbergk |
hgweb: rely on open_template()'s fallback to using templatedir()
|
Wed, 05 Aug 2020 14:03:14 -0700 |
Martin von Zweigbergk |
hgweb: open mapfile using templater.open_template()
|
Wed, 05 Aug 2020 13:58:30 -0700 |
Martin von Zweigbergk |
hgweb: simplify a constant-length list by converting to literal tuple
|
Wed, 05 Aug 2020 13:33:07 -0700 |
Martin von Zweigbergk |
hgweb: remove some accesses to private member uimod._unset
|
Thu, 30 Jul 2020 21:36:29 -0700 |
Martin von Zweigbergk |
templater: try to read %include in mapfiles from resources
|
Thu, 30 Jul 2020 15:29:06 -0700 |
Martin von Zweigbergk |
templater: unroll loop over mapfile directories
|
Tue, 04 Aug 2020 10:51:25 -0700 |
Martin von Zweigbergk |
templater: make open_template() read from resources if in frozen binary
|
Tue, 04 Aug 2020 13:22:00 -0700 |
Martin von Zweigbergk |
templater: pass opened file-like object to templatespec
|
Tue, 04 Aug 2020 13:21:29 -0700 |
Martin von Zweigbergk |
templater: replace templatepath() with function that also opens the file
|
Thu, 30 Jul 2020 13:44:06 -0700 |
Martin von Zweigbergk |
templater: start passing resource to read from into _readmapfile()
|
Tue, 04 Aug 2020 09:13:10 -0700 |
Martin von Zweigbergk |
templater: move stylemap() to hgweb_mod, since that's its only user
|
Mon, 03 Aug 2020 22:15:45 -0700 |
Martin von Zweigbergk |
hgweb: simplify staticfile() now that we always pass it a single directory
|
Fri, 31 Jul 2020 10:05:07 -0700 |
Martin von Zweigbergk |
packaging: include templates with their package as key in package_data
|
Fri, 31 Jul 2020 09:49:52 -0700 |
Martin von Zweigbergk |
packaging: mark mercurial.templates and subdirs as packages
|
Thu, 12 Dec 2019 12:41:01 -0800 |
Martin von Zweigbergk |
templates: add __init__.py files to templates/ dirs
|
Wed, 05 Aug 2020 13:36:50 -0400 |
Augie Fackler |
merge with stable
|
Tue, 21 Jul 2020 18:21:27 +0530 |
Pulkit Goyal |
localrepo: abort creating a shared repo if the source does not have store
|
Tue, 21 Jul 2020 13:58:58 +0530 |
Pulkit Goyal |
localrepo: only use 'bookmarksinstore' requirement if we have 'store'
|
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 14:44:29 +0530 |
Pulkit Goyal |
largefiles: introduce a constant for 'lfmr' action
|
Sat, 25 Jul 2020 14:41:20 +0530 |
Pulkit Goyal |
largefiles: override merge.emptyactions() to include `lfmr`
|
Sat, 25 Jul 2020 01:17:35 +0530 |
Pulkit Goyal |
merge: unify logic of couple of if-else's in manifestmerge()
|
Fri, 24 Jul 2020 23:49:08 +0530 |
Pulkit Goyal |
sparse: add comment for an if condition which I tried to refactor
|
Fri, 24 Jul 2020 23:40:07 +0530 |
Pulkit Goyal |
mergeactions: use action constants instead of string values
|
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)
|
Mon, 03 Aug 2020 23:13:58 +0530 |
Pulkit Goyal |
Added signature for changeset 7fc3c5fbc65f
stable
|
Mon, 03 Aug 2020 23:13:52 +0530 |
Pulkit Goyal |
Added tag 5.5 for changeset 7fc3c5fbc65f
stable
|
Sat, 01 Aug 2020 18:39:28 +0530 |
Pulkit Goyal |
mergestate: fix BC breakage introduced because of removal of a merge record
stable 5.5
|
Thu, 30 Jul 2020 22:49:51 -0700 |
Martin von Zweigbergk |
packaging: delete unnecessary updating of `dirs` list
|
Sun, 02 Aug 2020 10:08:18 -0700 |
Martin von Zweigbergk |
packaging: make "mercurial.defaultrc" a key in package_data
|
Thu, 30 Jul 2020 12:22:41 -0700 |
Martin von Zweigbergk |
templatespec: use new factory functions in hooklib
|
Mon, 20 Jul 2020 22:43:33 -0700 |
Martin von Zweigbergk |
templatespec: use new factory functions in logcmdutil
|
Mon, 20 Jul 2020 21:33:28 -0700 |
Martin von Zweigbergk |
templatespec: move check for non-unicode to lower-level function
|
Mon, 20 Jul 2020 21:32:10 -0700 |
Martin von Zweigbergk |
templatespec: logcmdutil.templatespec() gets either template or mapfile
|
Thu, 16 Jul 2020 13:33:46 -0700 |
Martin von Zweigbergk |
templatespec: create a factory function for each type there is
|
Wed, 29 Jul 2020 10:42:09 -0700 |
Martin von Zweigbergk |
templater: stop accepting a single style to stylemap()
|
Thu, 23 Jul 2020 10:20:48 -0700 |
Martin von Zweigbergk |
formatter: inline a variable assigned from `templater.templater.frommapfile`
|