- Mar 25, 2018
-
-
Yuya Nishihara authored
Some variants of this will be useful for stdio-based servers such as sshserver.
-
Yuya Nishihara authored
Prepares for porting to utils.procutil, in which ui shouldn't be known. ui.flush() is replaced with ui.fout.flush() since ui.ferr wasn't involved.
-
- Mar 24, 2018
-
-
Yuya Nishihara authored
Several functions are re-exported by utils.procutil, which require explicit modname parameter. .. api:: Utility functions related to process/executable management have been moved to utils.procutil module.
-
Yuya Nishihara authored
-
Yuya Nishihara authored
-
Yuya Nishihara authored
std* files, pipe helpers, and findexe()s are moved as well since they are likely to be used with sub processes.
-
Yuya Nishihara authored
To unblock code move to utils.*. It's merely two lines of very Pythonic code. No helper function should be needed.
-
Yuya Nishihara authored
Prepares for porting to utils.*.
-
Yuya Nishihara authored
util.hgcmd() is the public interface for gethgcmd().
-
- Mar 25, 2018
-
-
Matt Harbison authored
The errors from the last time I took a shot at this back in early November have disappeared, so let's just enable this.
-
- Mar 06, 2018
-
-
Gregory Szorc authored
We have nice constants now. Let's use them to make the code easier to reason about. Differential Revision: https://phab.mercurial-scm.org/D2702
-
Gregory Szorc authored
We finish up establishing named constants in this file with actions. I remember scratching my head trying to figure out what this code was doing as part of addressing a recent security issue with subrepos. Having the named constants in place definitely makes things easier to read. I'm not convinced the new constants have the best names (I'm not an expert in this code). But they can be changed easily enough. Also, since these constants are internal only, we might want to change their values to something more human readable to facilitate debugging. Or maybe we could employ an enum type some day... Differential Revision: https://phab.mercurial-scm.org/D2701
-
- Mar 05, 2018
-
-
Gregory Szorc authored
Named constants are easier to read than short string values. Differential Revision: https://phab.mercurial-scm.org/D2700
-
Gregory Szorc authored
Named constants are superior to magic values. Differential Revision: https://phab.mercurial-scm.org/D2699
-
Gregory Szorc authored
merge.py is using multiple discrete sets of 1 and 2 letter constants to define types and behavior. To the uninitiated, the code is very difficult to reason about. I didn't even realize there were multiple sets of constants in play initially! We begin our sanity injection with merge state records. The record types (which are serialized to disk) are now defined in RECORD_* constants. Differential Revision: https://phab.mercurial-scm.org/D2698
-
Gregory Szorc authored
Before, we had a branch that could return None for the update stats. Let's just return an updateresult instance instead. Differential Revision: https://phab.mercurial-scm.org/D2693
-
Gregory Szorc authored
Previously, we returned a tuple containing counts. The result of an update is kind of complex and the use of tuples with nameless fields made the code a bit harder to read and constrained future expansion of the return value. Let's invent an attrs-defined class for representing the result of an update operation. We provide __getitem__ and __len__ implementations for backwards compatibility as a container type to minimize code churn. In (at least) Python 2, the % operator seems to insist on using tuples. So we had to update a consumer using the % operator. .. api:: merge.update() and merge.applyupdates() now return a class with named attributes instead of a tuple. Switch consumers to access elements by name instead of by offset. Differential Revision: https://phab.mercurial-scm.org/D2692
-
- Feb 23, 2018
-
-
Sangeet Kumar Mishra authored
Earlier the code was only looking for rulehashes and neglecting all other revision identifiers, this code intercepts the fromrule function and calls scmutil.revsingle() on anything that is not a rulehash and then obtains the rulehash from the changectx object returned, rest of the pipeline follows as it was Differential Revision: https://phab.mercurial-scm.org/D2394
-
- Mar 17, 2018
-
-
Yuya Nishihara authored
mapping['node'] doesn't work since {node} is computed dynamically in non-web templates.
-
Yuya Nishihara authored
This isn't a pure templating business, so let's move out of the templater module. Note that this works only in web templates where mapping['node'] is a static value.
-
- Mar 15, 2018
-
-
Yuya Nishihara authored
It was pretty easy to leave a stale 'revcache' when switching 'ctx'. Let's make it be automatically replaced.
-
Yuya Nishihara authored
The 'revcache' dict will be inserted by this hook.
-
- Mar 24, 2018
-
-
Matt Harbison authored
Prior to adding path conflict checking in 989e884d1be9, the test-audit-path.t tests failed as shown here (but it was globbed away). 989e884d1be9 made it fail with a message about the destination manifest containing a conflict (though the no-symlink case wasn't updated). When the path conflict checking was gated behind an experimental config in 2a774cae3a03^::2a774cae3a03, the update started erroneously succeeding here. It turns out that the child of 989e884d1be9 is the origin of this change when path conflict checking is disabled, as shown by grafting the experimental config range on top of it. What's happening here is merge.batchget() is writing the symlink 'back' to wdir (but as a regular file for the no-symlink case), and then tries to write 'back/test', but calls wctx['back/test'].clearunknown() first. The code that's gated here was removing the newly written 'back' file, allowing 'back/test' to succeed. I tried checking for the dir components of 'back/test' in dirstate, and skipping removal if present. But that didn't work because the dirstate isn't updated after each file is written out. This is the last persistent test failure on Windows, so the testbot should start turning green now. \o/
-
Yuya Nishihara authored
There wasn't a usable hook point in httplib, so we have to replace connect() to wrap the socket before self._tunnel().
-
Yuya Nishihara authored
So safehasattr() can be imported by utils.* modules. util.safehasattr() still remains as an alias since it is pretty basic utility available for years. On current Python 3, the builtin hasattr() should have no problem.
-
Yuya Nishihara authored
IIRC, error.Abort exists since Mercurial 1.2, so it should be pretty easy for extensions authors to update their code. .. api:: The util.Abort alias has been removed. Use error.Abort.
-
Yuya Nishihara authored
-
Yuya Nishihara authored
-
Yuya Nishihara authored
Since it isn't supported on POSIX platform, we don't need to double the compatibility layers.
-
Yuya Nishihara authored
Since the 'ff...' hash should never be hidden, we can just ignore it.
-
- Mar 23, 2018
-
-
Gregory Szorc authored
Per discussion at https://phab.mercurial-scm.org/D2834, new URLs in hgweb can conflict with subrepos and virtual repos. This may prevent access to repos in certain paths or having certain names. Until we have a workaround for this, let's not serve requests for "api/" URLs unless the feature is enabled. Differential Revision: https://phab.mercurial-scm.org/D2936
-
Daniel Ploch authored
Differential Revision: https://phab.mercurial-scm.org/D2937
-
Daniel Ploch authored
Differential Revision: https://phab.mercurial-scm.org/D2935
-
- Mar 12, 2018
-
-
Pulkit Goyal authored
This patch adds functionality to show list of remote bookmarks in `hg bookmarks` command. There is some indenting problem in the test output as the current bookmark printing code in core can handle bookmark names of size 25 only gracefully. The idea is taken from hgremotenames extension which has --remote and --all flags to show remote bookmarks. However, this patch by defaults support showing list of remote bookmarks if remotenames extension is enabled and remotebookmarks are turned on. Differential Revision: https://phab.mercurial-scm.org/D2808
-
- Mar 11, 2018
-
-
Pulkit Goyal authored
This patch adds the functionality to hoist remotebookmarks to the top level namespace. The peer of which bookmarks should be hoisted can be set using `remotenames.hoistedpeer` config option. Only bookmarks can be hoisted. If a hoisted name and local bookmark exists of the same name, the local bookmark takes precedence. While I was here, I documented the default values of two other remotenames config options. Differential Revision: https://phab.mercurial-scm.org/D2807
-
- Mar 08, 2018
-
-
Kyle Lippincott authored
Differential Revision: https://phab.mercurial-scm.org/D2729
-
- Mar 23, 2018
-
-
Matt Harbison authored
Per the docstring for dirstate.normalize().
-
Matt Harbison authored
This fixes the failure in test-pathconflicts-basic.t on Windows. The test was passing in 'a\b', which was getting normalized to 'A\B', which isn't in dirstate. (The filesystem path is all lowercase anyway.) This isn't the only case of calling dirstate.normalize(), but other methods here (util.finddirs()) seem to assume the input paths are already using '/'. I think the backslash comes from wvfs.reljoin() (in this case), but could also come from wvfs.walk(), so this is the only case that needs it.
-
- Mar 22, 2018
-
-
Yuya Nishihara authored
.. api:: Several generic string helper functions have been moved to utils.stringutil module.
-
Yuya Nishihara authored
This might conflict with other patches floating around, sorry.
-