Mercurial: revision graph

graph

less more | rev 45468: (0) -30000 -10000 -3000 -1000 -240 +240 +1000 +3000 tip

merge: store ACTION_KEEP_ABSENT when we are keeping the file absent locally
Mon, 24 Aug 2020 15:20:09 +0530, by Pulkit Goyal
merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent
Tue, 01 Sep 2020 17:08:26 +0530, by Pulkit Goyal
mergeresult: introduce dedicated tuple for no-op actions
Mon, 14 Sep 2020 13:51:39 +0530, by Pulkit Goyal
tests: add criss cross merging tests whose behavior need to be fixed
Fri, 19 Jun 2020 13:27:46 +0200, by Pierre-Yves David
repo: avoid copying/updating a dict on every `repo.__getitem__`
Fri, 11 Sep 2020 15:52:06 -0700, by Kyle Lippincott
obsstore: refactor v1 logic to fix 32 byte hash support
Thu, 23 Jul 2020 20:23:44 +0200, by Joerg Sonnenberger
fsmonitor: increase the threshold before we recommend it, when using rust
Mon, 14 Sep 2020 11:32:24 -0400, by Valentin Gatien-Baron
copy-tracing: test case where a merge reverted a file deletion
Fri, 19 Jun 2020 06:15:06 +0200, by Pierre-Yves David
copy-tracing: test case where we go across a changed/deleted merge
Fri, 19 Jun 2020 06:04:48 +0200, by Pierre-Yves David
merge: show list of bids for each file in bid-merge in ui.debug()
Wed, 26 Aug 2020 17:20:53 +0530, by Pulkit Goyal
merge with stable
Mon, 14 Sep 2020 19:39:51 +0900, by Yuya Nishihara
cmdutil: reimplement finddate() without using walkchangerevs()
Sun, 13 Sep 2020 17:52:24 +0900, by Yuya Nishihara
test-simple-update: add test for -d DATE option
Sun, 13 Sep 2020 18:14:51 +0900, by Yuya Nishihara
largefiles: walk history in ascending order while downloading all lfiles
Sun, 13 Sep 2020 17:46:48 +0900, by Yuya Nishihara
largefiles: replace use of walkchangerevs() with simple revset query
Sun, 13 Sep 2020 17:43:19 +0900, by Yuya Nishihara
largefiles: remove unused 'rev' parameter from downloadlfiles()
Fri, 11 Sep 2020 10:47:17 +0900, by Yuya Nishihara
resourceutil: document when we expect to take the importlib.resouces code path
Sat, 12 Sep 2020 11:18:12 -0700, by Martin von Zweigbergk
templater: fix reading of templates in frozen binaries with py3 < 3.7
Thu, 10 Sep 2020 22:00:00 -0700, by Martin von Zweigbergk
histedit: cache description line
Fri, 11 Sep 2020 09:35:49 -0700, by Martin von Zweigbergk
tests: make emacs test less strict
Fri, 11 Sep 2020 09:55:08 -0700, by Martin von Zweigbergk
graphlog: use '%' only if there are *unresolved* conflicts
Thu, 10 Sep 2020 13:12:34 -0700, by Martin von Zweigbergk
merge: show number of ancestors in bid merge debug notes
Wed, 26 Aug 2020 17:24:22 +0530, by Pulkit Goyal
debugmergestate: sort extras before printing
Thu, 03 Sep 2020 14:45:16 +0530, by Pulkit Goyal
debugmergestate: show extras for files which are not in mergestate
Mon, 24 Aug 2020 18:59:19 +0530, by Pulkit Goyal
tests: update lockdelay.py to handle the `wait` argument
Thu, 10 Sep 2020 16:51:40 +0530, by Pulkit Goyal
commit: pass mergestate into _filecommit() instead of re-reading it
Thu, 03 Sep 2020 14:14:04 +0530, by Pulkit Goyal
py3: fix bytes and str mixup in run-tests
Fri, 11 Sep 2020 13:04:05 +0530, by Sushil khanchi
hg-core: fix some `clippy` warnings
Mon, 17 Aug 2020 10:59:30 +0200, by Antoine Cezar
rhg: print error message when argument parsing fails
Mon, 17 Aug 2020 16:55:43 +0200, by Antoine Cezar
rhg: fix `clippy` warnings
Thu, 13 Aug 2020 16:36:42 +0200, by Antoine Cezar
rhg: pass `ui` to `Command` `run`
Tue, 04 Aug 2020 16:11:23 +0200, by Antoine Cezar
rhg: add harness tests for rhg files
Mon, 03 Aug 2020 11:55:59 +0200, by Antoine Cezar
rhg: make output of `files` relative to the current directory and the root
Thu, 30 Jul 2020 16:55:44 +0200, by Raphaël Gomès
tags: take lock instead of wlock before writing hgtagsfnodes1 cache
Tue, 08 Sep 2020 19:36:40 +0530, by Pulkit Goyal
statichttprepo: use LockUnavailable() instead of Abort() for lock (API)
Thu, 10 Sep 2020 13:37:35 +0530, by Pulkit Goyal
localrepo: warn if we are writing to cache without a lock
Tue, 08 Sep 2020 18:46:01 +0530, by Pulkit Goyal
commit: fix a wrong argument name in documentation
Thu, 03 Sep 2020 14:14:40 +0530, by Pulkit Goyal
git: remove unrequired assignment of listignored and listunknown
Thu, 10 Sep 2020 17:03:38 +0530, by Pulkit Goyal
grep: fix hash(linestate) to not include linenum
Wed, 09 Sep 2020 11:41:18 +0900, by Yuya Nishihara
test-grep: document that trivially moved lines might not be detected
Tue, 08 Sep 2020 21:38:10 +0900, by Yuya Nishihara
revset: remove indirect indexing of status tuple
Wed, 09 Sep 2020 11:51:51 +0900, by Yuya Nishihara
rewriteutil: relax the sha1 hash references to handle future hash types
Tue, 25 Aug 2020 23:18:42 -0400, by Matt Harbison
phabricator: update the hashes in commit messages as they get submitted
Mon, 24 Aug 2020 18:51:25 -0400, by Matt Harbison
rewriteutil: also consider pending obsoletes when updating hashes in messages
Mon, 24 Aug 2020 18:44:15 -0400, by Matt Harbison
rewriteutil: extract evolve code used to replace obsolete hashes in commits
Mon, 24 Aug 2020 12:43:53 -0400, by Matt Harbison
git: fix index handling of removed files during commit (issue6398)
Mon, 07 Sep 2020 17:16:16 -0400, by Augie Fackler
git: make dirstate actually support listclean parameter
Mon, 07 Sep 2020 17:14:59 -0400, by Augie Fackler
git: make dirstate status() respect matcher
Mon, 07 Sep 2020 17:13:45 -0400, by Augie Fackler
git: fix up dirstate use of index
Mon, 07 Sep 2020 17:12:29 -0400, by Augie Fackler
git: correctly handle "nothing changed" commits
Mon, 07 Sep 2020 16:27:12 -0400, by Augie Fackler
localrepo: use functools.wraps() in unfilteredmethod decorator
Mon, 07 Sep 2020 16:25:16 -0400, by Augie Fackler
git: actually copy treemanifest instances in .copy() (issue6398)
Mon, 07 Sep 2020 16:13:10 -0400, by Augie Fackler
log: fix crash and bad filematcher lookup by -fr'wdir()' PATH stable
Fri, 11 Sep 2020 14:41:05 +0900, by Yuya Nishihara
hgdemandimport: bypass demandimport for _ast module (issue6407) stable
Wed, 09 Sep 2020 14:48:55 -0400, by Augie Fackler
git: restore basic functionality after b3040b6739ce
Mon, 07 Sep 2020 15:46:56 -0400, by Augie Fackler
git: convert tz offset to int (issue6359)
Mon, 07 Sep 2020 15:31:34 -0400, by Augie Fackler
repoview: pin revisions for `local` and `other` when a merge is active stable
Fri, 04 Sep 2020 15:21:02 -0400, by Matt Harbison
merge with stable
Mon, 07 Sep 2020 15:20:31 -0400, by Augie Fackler
extdiff: refactor cmdline and gui calculation login in a separate fn
Wed, 02 Sep 2020 19:46:55 +0530, by Pulkit Goyal
extdiff: reorder an if-else conditional
Wed, 02 Sep 2020 19:17:31 +0530, by Pulkit Goyal
run-tests: extract logic to get errpath in a utility func
Wed, 02 Sep 2020 23:09:45 +0530, by Sushil khanchi
run-tests: refactor filtering logic for --retest flag
Sat, 22 Aug 2020 16:31:34 +0530, by Sushil khanchi
tests: add a --retest test to demonstrate a fix in next patch
Thu, 27 Aug 2020 12:24:57 +0530, by Sushil khanchi
tests: remove a sub-test since we are done with it in test-run-tests.t
Thu, 27 Aug 2020 12:21:24 +0530, by Sushil khanchi
storageutil: allow modern hash sizes for fileids
Tue, 21 Jul 2020 22:41:45 +0200, by Joerg Sonnenberger
registrar: fix a documentation typo
Tue, 01 Sep 2020 22:28:41 -0400, by Matt Harbison
documentation: add `zstd` compression to the internal `revlogs` documentation
Mon, 10 Aug 2020 15:50:22 +0200, by Antoine Cezar
extdiff: move single file handling inside `not per-file` conditional
Sat, 29 Aug 2020 14:35:18 +0530, by Pulkit Goyal
extdiff: remove dir2root and pass full path as dir2 in _runperfilediff()
Sat, 29 Aug 2020 14:32:26 +0530, by Pulkit Goyal
extdiff: pass full paths of `dir1a` and `dir1b` to `_runperfilediff()`
Sat, 29 Aug 2020 14:28:34 +0530, by Pulkit Goyal
hgweb: compatibility of hgweb.cgi template with Python 3 stable
Wed, 02 Sep 2020 12:31:37 +0200, by Harald Klimach
genosxversion: don't give up if we can't find a path to hg libraries stable
Tue, 01 Sep 2020 10:33:10 -0400, by Augie Fackler
tests: fix test-demandimport.py on Python 3.9 stable
Wed, 02 Sep 2020 01:30:56 +0200, by Manuel Jacob
merge with stable
Tue, 01 Sep 2020 09:46:15 -0400, by Augie Fackler
Added signature for changeset f62bb5d07848 stable
Tue, 01 Sep 2020 16:27:25 +0530, by Pulkit Goyal
Added tag 5.5.1 for changeset f62bb5d07848 stable
Tue, 01 Sep 2020 16:27:18 +0530, by Pulkit Goyal
mercurial: force LF endings for *.py, *.{c,h} and *.t in .editorconfig
Mon, 24 Aug 2020 12:39:48 -0400, by Matt Harbison
hooklib: update documentation of changeset_obsoletedfor for changed hook type
Tue, 18 Aug 2020 22:21:00 +0800, by Aay Jay Chan
worker: don't expose readinto() on _blockingreader since pickle is picky
Fri, 14 Aug 2020 20:45:49 -0700, by Martin von Zweigbergk
test: add `test-repo` requirement to `test-check-format` (issue6395) stable 5.5.1
Thu, 27 Aug 2020 09:06:35 +0200, by Pierre-Yves David
commit: clear mergestate also with --amend (issue6304)
Tue, 18 Aug 2020 15:03:57 -0700, by Martin von Zweigbergk
tests: add test showing that merge state is not cleared by amend
Tue, 18 Aug 2020 14:26:49 -0700, by Martin von Zweigbergk
requirements: introduce constants for `shared` and `relshared` requirements
Tue, 11 Aug 2020 13:43:43 +0530, by Pulkit Goyal
mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)
Mon, 10 Aug 2020 15:47:21 +0530, by Pulkit Goyal
merge: introduce `addcommitinfo()` on mergeresult object
Mon, 10 Aug 2020 15:38:45 +0530, by Pulkit Goyal
merge: use collections.defaultdict() for mergeresult.commitinfo
Mon, 10 Aug 2020 15:34:27 +0530, by Pulkit Goyal
mergestate: use _stateextras instead of merge records for commit related info
Mon, 10 Aug 2020 15:29:02 +0530, by Pulkit Goyal
mergestate: use collections.defaultdict(dict) for _stateextras
Mon, 10 Aug 2020 15:09:44 +0530, by Pulkit Goyal
hgweb: minimize scope of a try-block in staticfile()
Mon, 03 Aug 2020 23:41:50 -0700, by Martin von Zweigbergk
hgweb: ignore web.templates config when guessing mime type for static content
Mon, 03 Aug 2020 23:38:50 -0700, by Martin von Zweigbergk
hgweb: let staticfile() look up path from default location unless provided
Sat, 22 Aug 2020 16:03:44 -0700, by Martin von Zweigbergk
hgweb: handle None from templatedir() equally bad in webcommands.py
Mon, 03 Aug 2020 22:40:05 -0700, by Martin von Zweigbergk
posixworker: avoid creating workers that end up getting no work
Thu, 13 Aug 2020 10:37:25 -0700, by Martin von Zweigbergk
revert: remove dangerous `parents` argument from `cmdutil.revert()`
Mon, 10 Aug 2020 21:46:47 -0700, by Martin von Zweigbergk
requirements: introduce a set of working directory specific requirements
Mon, 10 Aug 2020 18:08:15 -0700, by Pulkit Goyal
localrepo: move requirements constant to requirements module
Sat, 08 Aug 2020 16:37:59 +0530, by Pulkit Goyal
requirements: introduce new requirements related module
Sat, 08 Aug 2020 16:24:12 +0530, by Pulkit Goyal
repository: introduce constant for treemanifest requirement and use it
Sat, 08 Aug 2020 15:48:17 +0530, by Pulkit Goyal
tests: make flag parsing test more future safe
Tue, 21 Jul 2020 22:13:54 +0200, by Joerg Sonnenberger
rename: add support for --at-rev, which marks as copy and removes the source
Tue, 28 Jul 2020 09:58:28 -0700, by Martin von Zweigbergk
tests: make test-install.t work on debian systems
Fri, 24 Jul 2020 15:03:14 -0700, by Kyle Lippincott
rhg: handle broken pipe error for stderr
Fri, 24 Jul 2020 10:34:04 +0200, by Antoine Cezar
rhg: extract function handle_stdout_error
Fri, 24 Jul 2020 17:24:10 +0200, by Antoine Cezar
rhg: add a limited `rhg files` subcommand
Fri, 17 Jul 2020 17:24:54 +0200, by Antoine Cezar
rhg: add a `Files` `Command` to prepare the `rhg files` subcommand
Wed, 29 Jul 2020 10:21:17 +0200, by Antoine Cezar
rhg: simplify `FindRootError` handling
Wed, 29 Jul 2020 15:49:44 +0200, by Antoine Cezar
rhg: add buffered stdout writing possibility
Wed, 29 Jul 2020 10:26:17 +0200, by Antoine Cezar
rhg: ask the error message from `CommandError`
Mon, 20 Jul 2020 18:14:52 +0200, by Antoine Cezar
rhg: Do not return error when when we really mean ok in commands
Tue, 21 Jul 2020 10:39:30 +0200, by Antoine Cezar
hg-core: define a `ListTrackedFiles` `Operation`
Sat, 08 Aug 2020 12:52:39 -0700, by Antoine Cezar
hg-core: remove the `Operation` trait
Wed, 29 Jul 2020 10:08:09 +0200, by Antoine Cezar
hg-core: make parse_dirstate return references rather than update hashmaps
Tue, 04 Aug 2020 10:59:43 +0200, by Antoine Cezar
repository: introduce constant for internal phase repo requirement and use it
Fri, 07 Aug 2020 18:01:48 +0530, by Pulkit Goyal
repository: introduce constant for sparse repo requirement and use it
Sat, 08 Aug 2020 10:06:32 -0700, by Pulkit Goyal
localrepo: refactor `.hg/requires` reading logic in separate function
Fri, 07 Aug 2020 16:02:13 +0530, by Pulkit Goyal
localrepo: refactor logic to calculate sharedvfs in separate fn
Fri, 07 Aug 2020 15:52:52 +0530, by Pulkit Goyal
keepalive: Do not append _rbuf if _raw_readinto exists (issue6356) stable
Sun, 02 Aug 2020 17:40:35 +0200, by Cédric Krier
store: refactor space delimited list to proper data structure
Sat, 08 Aug 2020 10:13:37 -0700, by Pulkit Goyal
makefile: stop setting unused HGEXTDIR variable during osx build
Fri, 07 Aug 2020 21:59:43 -0700, by Martin von Zweigbergk
merge: drop commitinfo argument to applyupdates (API)
Thu, 06 Aug 2020 13:51:43 +0530, by Pulkit Goyal
merge: remove emptyactions() and use collections.defaultdict(list) instead
Thu, 06 Aug 2020 13:27:38 +0530, by Pulkit Goyal
merge: pass mergeresult obj in _forgetremoved() (API)
Wed, 05 Aug 2020 16:52:51 +0530, by Pulkit Goyal
mergeresult: introduce filemap() which yields filename based mapping
Wed, 05 Aug 2020 16:00:25 +0530, by Pulkit Goyal
mergeresult: add `files()` and use it
Wed, 05 Aug 2020 15:41:23 +0530, by Pulkit Goyal
mergeresult: introduce getfile() and use it where required
Wed, 05 Aug 2020 15:37:26 +0530, by Pulkit Goyal
merge: use ACTION_* constants instead of values in _filternarrowactions()
Wed, 05 Aug 2020 14:03:59 +0530, by Pulkit Goyal
merge: rework iteration over mergeresult object in checkpathconflicts()
Wed, 05 Aug 2020 13:50:49 +0530, by Pulkit Goyal
applyupdates: simplfy calculation of number of updated files
Wed, 05 Aug 2020 13:21:06 +0530, by Pulkit Goyal
mergeresult: yield from getactions() instead of buidling a list and returning
Mon, 03 Aug 2020 18:08:37 +0530, by Pulkit Goyal
sparse: replace merge action values with mergestate.ACTION_* constants
Mon, 03 Aug 2020 18:33:00 +0530, by Pulkit Goyal
mergeresult: implement a len() function and use it
Mon, 03 Aug 2020 17:58:18 +0530, by Pulkit Goyal
merge: replace use of actions dict with mergeresult object
Mon, 03 Aug 2020 17:32:30 +0530, by Pulkit Goyal
mergeresult: add sort argument to getactions() method
Mon, 03 Aug 2020 14:54:45 +0530, by Pulkit Goyal
merge: pass mergeresult obj in merge._prefetchfiles()
Mon, 03 Aug 2020 14:19:06 +0530, by Pulkit Goyal
merge: pass mergeresult obj instead of actions in applyupdates() (API)
Mon, 03 Aug 2020 14:12:13 +0530, by Pulkit Goyal
merge: pass mergeresult obj instead of actions in _checkcollision() (API)
Mon, 03 Aug 2020 13:30:14 +0530, by Pulkit Goyal
commitctx: directly update the touched and added set of files
Tue, 28 Jul 2020 20:21:06 +0200, by Pierre-Yves David
commitctx: directly updated the set of removed files
Tue, 28 Jul 2020 20:19:09 +0200, by Pierre-Yves David
commitctx: create the `ChangingFiles` object sooner
Wed, 29 Jul 2020 16:48:31 +0200, by Pierre-Yves David
commitctx: move ChangingFiles creation directly inside `_process_files`
Sat, 25 Jul 2020 16:34:02 +0200, by Pierre-Yves David
commitctx: create the ChangingFiles object directly in the various case
Sat, 25 Jul 2020 16:13:32 +0200, by Pierre-Yves David
commitctx: no longer make the storage and added/removed file optional
Sat, 25 Jul 2020 16:13:17 +0200, by Pierre-Yves David
commitctx: directly gather p1 and p2 copies in `files`
Sat, 25 Jul 2020 16:07:38 +0200, by Pierre-Yves David
commitctx: extract sidedata encoding inside its own function
Sat, 25 Jul 2020 16:02:26 +0200, by Pierre-Yves David
commitctx: directly pass a ChangingFiles object to changelog.add
Sat, 25 Jul 2020 15:55:09 +0200, by Pierre-Yves David
commitctx: return a richer object from _prepare_files
Sat, 25 Jul 2020 15:49:12 +0200, by Pierre-Yves David
templater: teach template loader to use open_template() function
Thu, 06 Aug 2020 10:53:00 -0700, by Martin von Zweigbergk
templater: restructure open_template() a little to prepare for relative paths
Thu, 06 Aug 2020 10:52:52 -0700, by Martin von Zweigbergk
templater: add exception-raising version of open_template()
Thu, 06 Aug 2020 09:50:10 -0700, by Martin von Zweigbergk
templater: replace Py3-only exception types by super-types available in Py2
Wed, 05 Aug 2020 22:13:51 -0700, by Martin von Zweigbergk
hgweb: enable reading styles from resources in frozen binaries
Wed, 05 Aug 2020 14:19:42 -0700, by Martin von Zweigbergk
hgweb: rely on open_template()'s fallback to using templatedir()
Wed, 05 Aug 2020 14:03:45 -0700, by Martin von Zweigbergk
hgweb: open mapfile using templater.open_template()
Wed, 05 Aug 2020 14:03:14 -0700, by Martin von Zweigbergk
hgweb: simplify a constant-length list by converting to literal tuple
Wed, 05 Aug 2020 13:58:30 -0700, by Martin von Zweigbergk
hgweb: remove some accesses to private member uimod._unset
Wed, 05 Aug 2020 13:33:07 -0700, by Martin von Zweigbergk
templater: try to read %include in mapfiles from resources
Thu, 30 Jul 2020 21:36:29 -0700, by Martin von Zweigbergk
templater: unroll loop over mapfile directories
Thu, 30 Jul 2020 15:29:06 -0700, by Martin von Zweigbergk
templater: make open_template() read from resources if in frozen binary
Tue, 04 Aug 2020 10:51:25 -0700, by Martin von Zweigbergk
templater: pass opened file-like object to templatespec
Tue, 04 Aug 2020 13:22:00 -0700, by Martin von Zweigbergk
templater: replace templatepath() with function that also opens the file
Tue, 04 Aug 2020 13:21:29 -0700, by Martin von Zweigbergk
templater: start passing resource to read from into _readmapfile()
Thu, 30 Jul 2020 13:44:06 -0700, by Martin von Zweigbergk
templater: move stylemap() to hgweb_mod, since that's its only user
Tue, 04 Aug 2020 09:13:10 -0700, by Martin von Zweigbergk
hgweb: simplify staticfile() now that we always pass it a single directory
Mon, 03 Aug 2020 22:15:45 -0700, by Martin von Zweigbergk
packaging: include templates with their package as key in package_data
Fri, 31 Jul 2020 10:05:07 -0700, by Martin von Zweigbergk
packaging: mark mercurial.templates and subdirs as packages
Fri, 31 Jul 2020 09:49:52 -0700, by Martin von Zweigbergk
templates: add __init__.py files to templates/ dirs
Thu, 12 Dec 2019 12:41:01 -0800, by Martin von Zweigbergk
merge with stable
Wed, 05 Aug 2020 13:36:50 -0400, by Augie Fackler
localrepo: abort creating a shared repo if the source does not have store
Tue, 21 Jul 2020 18:21:27 +0530, by Pulkit Goyal
localrepo: only use 'bookmarksinstore' requirement if we have 'store'
Tue, 21 Jul 2020 13:58:58 +0530, by Pulkit Goyal
mergeresult: make actionmapping a dict of dict instead of dict of lists
Sat, 25 Jul 2020 01:42:41 +0530, by Pulkit Goyal
largefiles: introduce a constant for 'lfmr' action
Sat, 25 Jul 2020 14:44:29 +0530, by Pulkit Goyal
largefiles: override merge.emptyactions() to include `lfmr`
Sat, 25 Jul 2020 14:41:20 +0530, by Pulkit Goyal
merge: unify logic of couple of if-else's in manifestmerge()
Sat, 25 Jul 2020 01:17:35 +0530, by Pulkit Goyal
sparse: add comment for an if condition which I tried to refactor
Fri, 24 Jul 2020 23:49:08 +0530, by Pulkit Goyal
mergeactions: use action constants instead of string values
Fri, 24 Jul 2020 23:40:07 +0530, by Pulkit Goyal
merge: use the new action based mapping introduced in mergeresult obj
Sun, 02 Aug 2020 10:24:28 -0700, by Pulkit Goyal
mergeresult: introduce action -> (filename, data, msg) mapping and related API
Fri, 24 Jul 2020 19:48:38 +0530, by Pulkit Goyal
mergeresult: rename _actions to _filemapping
Sun, 02 Aug 2020 10:15:55 -0700, by Pulkit Goyal
sparse: pass mergeresult obj in sparse.filterupdatesactions() (API)
Fri, 24 Jul 2020 19:19:47 +0530, by Pulkit Goyal
merge: filter actions before calling _resolvetrivial()
Fri, 24 Jul 2020 19:13:20 +0530, by Pulkit Goyal
merge: introduce mergeresult.updateactions() and use it
Fri, 24 Jul 2020 18:16:29 +0530, by Pulkit Goyal
merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
Fri, 24 Jul 2020 17:57:23 +0530, by Pulkit Goyal
merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
Fri, 24 Jul 2020 17:52:33 +0530, by Pulkit Goyal
merge: pass mergeresult obj instead of actions in _filternarrowactions()
Fri, 24 Jul 2020 17:49:13 +0530, by Pulkit Goyal
merge: pass mergeresult in checkpassconflicts() instead of actions (API)
Fri, 24 Jul 2020 17:31:26 +0530, by Pulkit Goyal
merge: add removefile() to mergeresult object
Fri, 24 Jul 2020 16:23:55 +0530, by Pulkit Goyal
merge: introduce mergeresult.addfile() and use it
Fri, 24 Jul 2020 16:18:39 +0530, by Pulkit Goyal
merge: make mergeresult constructor initialize empty object
Fri, 24 Jul 2020 15:56:11 +0530, by Pulkit Goyal
merge: improve documentation of fbid dict used for merge bid
Fri, 24 Jul 2020 15:15:20 +0530, by Pulkit Goyal
merge: move conversion of file-key dict to action-key dict in mergeresult
Fri, 24 Jul 2020 14:45:00 +0530, by Pulkit Goyal
merge: introduce hasconflicts() on mergeresult object
Sun, 02 Aug 2020 10:12:21 -0700, by Pulkit Goyal
merge: remove no longer required ACTION_GET_OTHER_AND_STORE
Tue, 14 Jul 2020 16:40:28 +0530, by Pulkit Goyal
merge: pass commitinfo to applyupdates() and get it stored in mergestate
Tue, 14 Jul 2020 16:31:52 +0530, by Pulkit Goyal
merge: introduce 'commitinfo' in mergeresult
Tue, 14 Jul 2020 16:21:08 +0530, by Pulkit Goyal
merge: return a mergeresult obj from manifestmerge(), calculateupdates() (API)
Thu, 23 Jul 2020 18:03:14 +0530, by Pulkit Goyal
Added signature for changeset 7fc3c5fbc65f stable
Mon, 03 Aug 2020 23:13:58 +0530, by Pulkit Goyal
Added tag 5.5 for changeset 7fc3c5fbc65f stable
Mon, 03 Aug 2020 23:13:52 +0530, by Pulkit Goyal
mergestate: fix BC breakage introduced because of removal of a merge record stable 5.5
Sat, 01 Aug 2020 18:39:28 +0530, by Pulkit Goyal
packaging: delete unnecessary updating of `dirs` list
Thu, 30 Jul 2020 22:49:51 -0700, by Martin von Zweigbergk
packaging: make "mercurial.defaultrc" a key in package_data
Sun, 02 Aug 2020 10:08:18 -0700, by Martin von Zweigbergk
templatespec: use new factory functions in hooklib
Thu, 30 Jul 2020 12:22:41 -0700, by Martin von Zweigbergk
templatespec: use new factory functions in logcmdutil
Mon, 20 Jul 2020 22:43:33 -0700, by Martin von Zweigbergk
templatespec: move check for non-unicode to lower-level function
Mon, 20 Jul 2020 21:33:28 -0700, by Martin von Zweigbergk
templatespec: logcmdutil.templatespec() gets either template or mapfile
Mon, 20 Jul 2020 21:32:10 -0700, by Martin von Zweigbergk
templatespec: create a factory function for each type there is
Thu, 16 Jul 2020 13:33:46 -0700, by Martin von Zweigbergk
templater: stop accepting a single style to stylemap()
Wed, 29 Jul 2020 10:42:09 -0700, by Martin von Zweigbergk
formatter: inline a variable assigned from `templater.templater.frommapfile`
Thu, 23 Jul 2020 10:20:48 -0700, by Martin von Zweigbergk
templater: don't normalize path separators to '/' when interacting with OS
Wed, 22 Jul 2020 21:23:46 -0700, by Martin von Zweigbergk
formatter: remove now-unnecessary check for file-ness
Thu, 23 Jul 2020 22:50:20 -0700, by Martin von Zweigbergk
templater: make templatepath() not return directory paths
Thu, 23 Jul 2020 22:47:55 -0700, by Martin von Zweigbergk
tests: show unusual error message for `hg log --style coal`
Thu, 23 Jul 2020 22:44:18 -0700, by Martin von Zweigbergk
config: remove now-unused `abs` argument from `include` callback
Wed, 22 Jul 2020 10:34:24 -0700, by Martin von Zweigbergk
config: re-calculate absolute %include path in `include` callback
Wed, 22 Jul 2020 10:32:28 -0700, by Martin von Zweigbergk
subrepoutil: use relative path for looking up config `%include`s
Wed, 22 Jul 2020 10:25:28 -0700, by Martin von Zweigbergk
config: remove now-unused support for "includepaths"
Wed, 22 Jul 2020 00:13:02 -0700, by Martin von Zweigbergk
dispatch: adjust ui.flush() timing to stabilize test-blackbox.t stable
Sat, 25 Jul 2020 22:51:26 +0900, by Yuya Nishihara
clonebundles: document REQUIREDRAM key stable
Sun, 26 Jul 2020 12:46:04 -0700, by Gregory Szorc
commitctx: gather more code dealing with copy-in-extra
Sat, 25 Jul 2020 15:37:05 +0200, by Pierre-Yves David
commitctx: rename files to touched in a couple of place
Sat, 25 Jul 2020 15:33:45 +0200, by Pierre-Yves David
commitctx: extract copy information encoding into extra into commit.py
Sat, 25 Jul 2020 15:13:25 +0200, by Pierre-Yves David
commitctx: create the new extra dict on its own line
Sat, 25 Jul 2020 14:59:55 +0200, by Pierre-Yves David
commitctx: explicitly pass `manifest` to _commit_manifest
Wed, 29 Jul 2020 15:40:13 +0200, by Pierre-Yves David
phabricator: unconditionally pop `test_vcr` to fix debugcallconduit
Thu, 30 Jul 2020 16:58:38 +0100, by Ian Moody
phabricator: demonstrate debugcallconduit being broken without --test-vcr
Thu, 30 Jul 2020 16:52:12 +0100, by Ian Moody
cleanup: fix bad formatting of state.py from D8811
Tue, 28 Jul 2020 11:11:14 -0700, by Martin von Zweigbergk
dirstate: restore original estimation and update comment
Thu, 30 Jul 2020 16:13:17 +0200, by Joerg Sonnenberger
merge stable in default
Fri, 31 Jul 2020 17:09:31 +0530, by Pulkit Goyal
dirstate: revert change to Rust binding
Thu, 30 Jul 2020 01:10:10 +0200, by Joerg Sonnenberger
relnotes: copy "next" to "5.5" and clear "next" stable
Tue, 28 Jul 2020 10:19:49 -0700, by Martin von Zweigbergk
commitctx: extract all the file preparation logic in a new function
Thu, 23 Jul 2020 23:52:31 +0200, by Pierre-Yves David
commitctx: gather more preparation code within the lock context
Thu, 23 Jul 2020 23:58:23 +0200, by Pierre-Yves David
commitctx: move a special case about files earlier
Thu, 23 Jul 2020 23:40:59 +0200, by Pierre-Yves David
commitctx: extract all the manual logic to process the files
Thu, 23 Jul 2020 18:25:45 +0200, by Pierre-Yves David
commitctx: treat `filesadded` more like `filesremoved`
Thu, 23 Jul 2020 23:08:00 +0200, by Pierre-Yves David
commitctx: move `writechangesetcopy` business at the end a code section
Thu, 23 Jul 2020 22:58:29 +0200, by Pierre-Yves David
commitctx: move copy meta config reading in a dedicated function
Thu, 23 Jul 2020 21:09:42 +0200, by Pierre-Yves David
commitctx: no longer use the `writecopiesto` variable in the function
Thu, 23 Jul 2020 21:03:30 +0200, by Pierre-Yves David
commitctx: extract the function that commit a new manifest
Thu, 23 Jul 2020 14:58:21 +0200, by Pierre-Yves David
commitctx: stop using weakref proxy for transaction
Fri, 24 Jul 2020 12:52:32 +0200, by Pierre-Yves David
rebase: fix regression in file change detection introduced by 0ecb3b11fcad stable
Tue, 28 Jul 2020 20:47:50 +0200, by Manuel Jacob

less more | rev 45468: (0) -30000 -10000 -3000 -1000 -240 +240 +1000 +3000 tip

Mercurial > hg

graph