D1270: help: adding a topic on flags

2017-10-30 Thread martinvonz (Martin von Zweigbergk) 
martinvonz added a comment.


  We're in code freeze for approximately two more days, so this will have to 
wait until ~Thursday. Still, thanks for the patch. I'm happy to include 
something like this. Things that struck me as missing:
  
  1. Long vs short form (that e.g. "--verbose" and "-v" are equivalent if the 
refer to the same flag, which they do)
  2. Non-list, non-boolean flags that take arguments, such as "--rev", and that 
"--rev=tip", "--rev tip", "-r=tip", "-r tip", and "-rtip" are equivalent
  3. Short flags can be combined: "-pvr tip" is valid
  4. Later flags override earlier flags
  
  We don't necessarily have to include all that in the first patch.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1270

To: rdamazio, #hg-reviewers
Cc: martinvonz, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D1270: help: adding a topic on flags

2017-10-30 Thread rdamazio (Rodrigo Damazio Bovendorp) 
rdamazio created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This is a short topic to explain how command-line flags can be specified.
  
  Some users have been confused by hg offerring different flag syntax than some
  other libraries, so it'd be nice to point them to this rather than explaining
  it every time.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1270

AFFECTED FILES
  contrib/wix/help.wxs
  mercurial/help.py
  mercurial/help/flags.txt
  tests/test-globalopts.t
  tests/test-help.t
  tests/test-hgweb-json.t

CHANGE DETAILS

diff --git a/tests/test-hgweb-json.t b/tests/test-hgweb-json.t
--- a/tests/test-hgweb-json.t
+++ b/tests/test-hgweb-json.t
@@ -1581,6 +1581,10 @@
 "topic": "filesets"
   },
   {
+"summary": "Command-line flags",
+"topic": "flags"
+  },
+  {
 "summary": "Glossary",
 "topic": "glossary"
   },
diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -110,6 +110,7 @@
environment   Environment Variables
extensionsUsing Additional Features
filesets  Specifying File Sets
+   flags Command-line flags
glossary  Glossary
hgignore  Syntax for Mercurial Ignore Files
hgweb Configuring hgweb
@@ -188,6 +189,7 @@
environment   Environment Variables
extensionsUsing Additional Features
filesets  Specifying File Sets
+   flags Command-line flags
glossary  Glossary
hgignore  Syntax for Mercurial Ignore Files
hgweb Configuring hgweb
@@ -865,6 +867,7 @@
environment   Environment Variables
extensionsUsing Additional Features
filesets  Specifying File Sets
+   flags Command-line flags
glossary  Glossary
hgignore  Syntax for Mercurial Ignore Files
hgweb Configuring hgweb
@@ -2010,6 +2013,13 @@
   Specifying File Sets
   
   
+  
+  flags
+  
+  
+  Command-line flags
+  
+  
   
   glossary
   
diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
--- a/tests/test-globalopts.t
+++ b/tests/test-globalopts.t
@@ -355,6 +355,7 @@
environment   Environment Variables
extensionsUsing Additional Features
filesets  Specifying File Sets
+   flags Command-line flags
glossary  Glossary
hgignore  Syntax for Mercurial Ignore Files
hgweb Configuring hgweb
@@ -439,6 +440,7 @@
environment   Environment Variables
extensionsUsing Additional Features
filesets  Specifying File Sets
+   flags Command-line flags
glossary  Glossary
hgignore  Syntax for Mercurial Ignore Files
hgweb Configuring hgweb
diff --git a/mercurial/help/flags.txt b/mercurial/help/flags.txt
new file mode 100644
--- /dev/null
+++ b/mercurial/help/flags.txt
@@ -0,0 +1,53 @@
+Most Mercurial commands accept various flags.
+
+Flag types
+==
+
+Mercurial command-line flags can be strings, numbers, booleans, or lists of
+strings.
+
+Specifying boolean flags
+
+
+Boolean flags do not take a value parameter. To specify a boolean, use the flag
+name to set it to true, or the same name prefixed with 'no-' to set it to
+false::
+
+hg commit --interactive
+hg commit --no-interactive
+
+Specifying list flags
+=
+
+List flags take multiple values. To specify them, pass the flag multiple 
times::
+
+hg files --include mercurial --include tests
+
+Setting flag defaults
+=
+
+In order to set a default value for a flag in an hgrc file, set it under the
+[defaults] section of the hgrc file::
+
+[defaults]
+commit = --interactive
+
+For more information on hgrc files, see :hg:help:config.
+
+Overriding flag defaults
+
+
+Every flag has a default value, and you may also set your own defaults in hgrc
+as described above.
+Except for list flags, defaults can be overridden on the command line simplify
+by specifying the flag in that location.
+
+Hidden flags
+
+
+Some flags are not shown in a command's help by default - specifically, those
+that are deemed to be experimental, deprecated or advanced. To show all flags,
+add the --verbose flag for the help command::
+
+hg help --verbose commit
+
diff --git a/mercurial/help.py b/mercurial/help.py
--- a/mercurial/help.py
+++ b/mercurial/help.py
@@ -224,6 +224,7 @@
 (['color'], _("Colorizing Outputs"), loaddoc('color')),
 (["config", "hgrc"], _("Configuration Files"), loaddoc('config')),
 (["dates"], _("Date Formats"), loaddoc('dates')),
+(["flags"], _("Command-line flags"), loaddoc('flags')),
 (["patterns"], _("File Name Patterns"), loaddoc('patterns')),
 (['environment', 'env'], _('Environment Variables'),
  loaddoc('environment')),
diff --git a/contrib/wix/help.wxs

D1269: children: fix the log expansion of `hg children` in doc

2017-10-30 Thread pulkit (Pulkit Goyal) 
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd2554ef04d26: children: fix the log expansion of `hg 
children` in doc (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1269?vs=3163=3164

REVISION DETAIL
  https://phab.mercurial-scm.org/D1269

AFFECTED FILES
  hgext/children.py

CHANGE DETAILS

diff --git a/hgext/children.py b/hgext/children.py
--- a/hgext/children.py
+++ b/hgext/children.py
@@ -49,7 +49,7 @@
 
 Please use :hg:`log` instead::
 
-hg children => hg log -r "children()"
+hg children => hg log -r "children(.)"
 hg children -r REV => hg log -r "children(REV)"
 
 See :hg:`help log` and :hg:`help revsets.children`.



To: pulkit, #hg-reviewers, durin42
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH] filemerge: pass a default value to _toolstr

2017-10-30 Thread Augie Fackler 
On Sat, Oct 28, 2017 at 02:19:17PM +0900, Yuya Nishihara wrote:
> On Thu, 26 Oct 2017 11:07:19 -0700, Kostia Balytskyi wrote:
> > # HG changeset patch
> > # User Kostia Balytskyi 
> > # Date 1509041226 25200
> > #  Thu Oct 26 11:07:06 2017 -0700
> > # Branch stable
> > # Node ID 81db944aae69a96175fd0d917834e67534a92735
> > # Parent  9e9ff559440e4733fda49ddeb1b9ce5e7c9660af
> > filemerge: pass a default value to _toolstr
>
> (issue5718)

Queued with that added, thanks.

>
> > After a refactoring, _toolstr stopped having default="" as one of it's args,
> > therefore when called without a default it returns None and not "". This 
> > causes
> > concatenation to fail.
> >
> > diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
> > --- a/mercurial/filemerge.py
> > +++ b/mercurial/filemerge.py
> > @@ -116,7 +116,7 @@ def findexternaltool(ui, tool):
> >  continue
> >  p = util.lookupreg(k, _toolstr(ui, tool, "regname"))
> >  if p:
> > -p = util.findexe(p + _toolstr(ui, tool, "regappend"))
> > +p = util.findexe(p + _toolstr(ui, tool, "regappend", ""))
>
> Perhaps this has to be added to the config table instead.

Very likely. I'm not going to sweat it for right now, as this fixes a
regression in any case.

> ___
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D1269: children: fix the log expansion of `hg children` in doc

2017-10-30 Thread pulkit (Pulkit Goyal) 
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  `hg log -r children()` returns `hg: parse error: missing argument`.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1269

AFFECTED FILES
  hgext/children.py

CHANGE DETAILS

diff --git a/hgext/children.py b/hgext/children.py
--- a/hgext/children.py
+++ b/hgext/children.py
@@ -49,7 +49,7 @@
 
 Please use :hg:`log` instead::
 
-hg children => hg log -r "children()"
+hg children => hg log -r "children(.)"
 hg children -r REV => hg log -r "children(REV)"
 
 See :hg:`help log` and :hg:`help revsets.children`.



To: pulkit, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

[Bug 5724] New: terse status doesn't honor explicit paths

2017-10-30 Thread mercurial-bugs 
https://bz.mercurial-scm.org/show_bug.cgi?id=5724

Bug ID: 5724
   Summary: terse status doesn't honor explicit paths
   Product: Mercurial
   Version: 4.4-rc
  Hardware: PC
OS: All
Status: UNCONFIRMED
  Severity: feature
  Priority: wish
 Component: Mercurial
  Assignee: bugzi...@mercurial-scm.org
  Reporter: matt_harbi...@yahoo.com
CC: 7895pul...@gmail.com,
mercurial-devel@mercurial-scm.org

It makes sense that the listed paths are as short as possible if status isn't
path restricted, but it probably should honor the path arguments if present.

$ hg status --terse c -c mercurial/cext
C mercurial\

To be consistent with non-terse status, I'd expect the following output for a
clean repo:

C mercurial\cext

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D1222: merge: add a config option to disable path conflict checking

2017-10-30 Thread sid0 (Siddharth Agarwal) 
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG37450a122128: merge: add a config option to disable path 
conflict checking (authored by sid0, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1222?vs=3081=3160

REVISION DETAIL
  https://phab.mercurial-scm.org/D1222

AFFECTED FILES
  mercurial/configitems.py
  mercurial/merge.py

CHANGE DETAILS

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -693,6 +693,7 @@
 abortconflicts = set()
 unknownconfig = _getcheckunknownconfig(repo, 'merge', 'checkunknown')
 ignoredconfig = _getcheckunknownconfig(repo, 'merge', 'checkignored')
+pathconfig = repo.ui.configbool('experimental', 'merge.checkpathconflicts')
 if not force:
 def collectconflicts(conflicts, config):
 if config == 'abort':
@@ -704,7 +705,7 @@
 if m in ('c', 'dc'):
 if _checkunknownfile(repo, wctx, mctx, f):
 fileconflicts.add(f)
-elif f not in wctx:
+elif pathconfig and f not in wctx:
 path = _checkunknowndirs(repo, f)
 if path is not None:
 pathconflicts.add(path)
@@ -1139,8 +1140,9 @@
 actions[f] = ('dc', (None, f, f, False, pa.node()),
   "prompt deleted/changed")
 
-# If we are merging, look for path conflicts.
-checkpathconflicts(repo, wctx, p2, actions)
+if repo.ui.configbool('experimental', 'merge.checkpathconflicts'):
+# If we are merging, look for path conflicts.
+checkpathconflicts(repo, wctx, p2, actions)
 
 return actions, diverge, renamedelete
 
diff --git a/mercurial/configitems.py b/mercurial/configitems.py
--- a/mercurial/configitems.py
+++ b/mercurial/configitems.py
@@ -578,6 +578,9 @@
 coreconfigitem('merge', 'checkignored',
 default='abort',
 )
+coreconfigitem('experimental', 'merge.checkpathconflicts',
+default=True,
+)
 coreconfigitem('merge', 'followcopies',
 default=True,
 )



To: sid0, #hg-reviewers, durin42
Cc: lothiraldan, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D1201: dirstate: clean up when restoring identical backups

2017-10-30 Thread mbthomas (Mark Thomas) 
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGc2b30348930f: dirstate: clean up when restoring identical 
backups (authored by mbthomas, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1201?vs=3048=3159

REVISION DETAIL
  https://phab.mercurial-scm.org/D1201

AFFECTED FILES
  mercurial/dirstate.py
  tests/test-dirstate-backup.t

CHANGE DETAILS

diff --git a/tests/test-dirstate-backup.t b/tests/test-dirstate-backup.t
--- a/tests/test-dirstate-backup.t
+++ b/tests/test-dirstate-backup.t
@@ -11,9 +11,8 @@
   abort: stdin: no diffs found
   [255]
 
-A dirstate backup is left behind
+No dirstate backups are left behind
 
   $ ls .hg/dirstate* | sort
   .hg/dirstate
-  .hg/dirstate.backup.import.* (glob)
 
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -1187,7 +1187,11 @@
 # changes of dirstate out after restoring from backup file
 self.invalidate()
 filename = self._actualfilename(tr)
-self._opener.rename(backupname, filename, checkambig=True)
+o = self._opener
+if util.samefile(o.join(backupname), o.join(filename)):
+o.unlink(backupname)
+else:
+o.rename(backupname, filename, checkambig=True)
 
 def clearbackup(self, tr, backupname):
 '''Clear backup file'''



To: mbthomas, #hg-reviewers, krbullock, durham, durin42
Cc: durin42, martinvonz, krbullock, durham, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D1200: tests: add a test demonstrating failure to clean up dirstate backups

2017-10-30 Thread mbthomas (Mark Thomas) 
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2c80a864e83e: tests: add a test demonstrating failure to 
clean up dirstate backups (authored by mbthomas, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1200?vs=3047=3158

REVISION DETAIL
  https://phab.mercurial-scm.org/D1200

AFFECTED FILES
  tests/test-dirstate-backup.t

CHANGE DETAILS

diff --git a/tests/test-dirstate-backup.t b/tests/test-dirstate-backup.t
new file mode 100644
--- /dev/null
+++ b/tests/test-dirstate-backup.t
@@ -0,0 +1,19 @@
+Set up
+
+  $ hg init repo
+  $ cd repo
+
+Try to import an empty patch
+
+  $ hg import --no-commit - < EOF
+  applying patch from stdin
+  abort: stdin: no diffs found
+  [255]
+
+A dirstate backup is left behind
+
+  $ ls .hg/dirstate* | sort
+  .hg/dirstate
+  .hg/dirstate.backup.import.* (glob)
+



To: mbthomas, #hg-reviewers, krbullock, durin42
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D1223: merge: disable path conflict checking by default (issue5716)

2017-10-30 Thread sid0 (Siddharth Agarwal) 
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2a774cae3a03: merge: disable path conflict checking by 
default (issue5716) (authored by sid0, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1223?vs=3082=3161

REVISION DETAIL
  https://phab.mercurial-scm.org/D1223

AFFECTED FILES
  mercurial/configitems.py
  tests/test-audit-path.t
  tests/test-commandserver.t
  tests/test-merge1.t
  tests/test-pathconflicts-basic.t
  tests/test-pathconflicts-merge.t
  tests/test-pathconflicts-update.t
  tests/test-update-names.t

CHANGE DETAILS

diff --git a/tests/test-update-names.t b/tests/test-update-names.t
--- a/tests/test-update-names.t
+++ b/tests/test-update-names.t
@@ -50,9 +50,7 @@
   $ hg st
   ? name/file
   $ hg up 1
-  name: untracked directory conflicts with file
-  abort: untracked files in working directory differ from files in requested 
revision
-  [255]
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..
 
 #if symlink
diff --git a/tests/test-pathconflicts-update.t 
b/tests/test-pathconflicts-update.t
--- a/tests/test-pathconflicts-update.t
+++ b/tests/test-pathconflicts-update.t
@@ -1,3 +1,11 @@
+Path conflict checking is currently disabled by default because of issue5716.
+Turn it on for this test.
+
+  $ cat >> $HGRCPATH << EOF
+  > [experimental]
+  > merge.checkpathconflicts=True
+  > EOF
+
   $ hg init repo
   $ cd repo
   $ echo base > base
@@ -150,4 +158,3 @@
   $ hg up file2 --clean
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark file2)
-
diff --git a/tests/test-pathconflicts-merge.t b/tests/test-pathconflicts-merge.t
--- a/tests/test-pathconflicts-merge.t
+++ b/tests/test-pathconflicts-merge.t
@@ -1,3 +1,11 @@
+Path conflict checking is currently disabled by default because of issue5716.
+Turn it on for this test.
+
+  $ cat >> $HGRCPATH << EOF
+  > [experimental]
+  > merge.checkpathconflicts=True
+  > EOF
+
   $ hg init repo
   $ cd repo
   $ echo base > base
diff --git a/tests/test-pathconflicts-basic.t b/tests/test-pathconflicts-basic.t
--- a/tests/test-pathconflicts-basic.t
+++ b/tests/test-pathconflicts-basic.t
@@ -1,3 +1,11 @@
+Path conflict checking is currently disabled by default because of issue5716.
+Turn it on for this test.
+
+  $ cat >> $HGRCPATH << EOF
+  > [experimental]
+  > merge.checkpathconflicts=True
+  > EOF
+
   $ hg init repo
   $ cd repo
   $ echo base > base
@@ -96,4 +104,3 @@
   commit: (clean)
   update: 1 new changesets, 2 branch heads (merge)
   phases: 4 draft
-
diff --git a/tests/test-merge1.t b/tests/test-merge1.t
--- a/tests/test-merge1.t
+++ b/tests/test-merge1.t
@@ -30,22 +30,23 @@
 
   $ mkdir b && touch b/nonempty
   $ hg up
-  b: untracked directory conflicts with file
-  abort: untracked files in working directory differ from files in requested 
revision
-  [255]
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg ci
   nothing changed
   [1]
   $ hg sum
-  parent: 0:538afb845929 
-   commit #0
+  parent: 1:b8bb4a988f25 tip
+   commit #1
   branch: default
-  commit: 1 unknown (clean)
-  update: 1 new changesets (update)
+  commit: (clean)
+  update: (current)
   phases: 2 draft
-  $ rm b/nonempty
+
+The following line is commented out because the file doesn't exist at the 
moment, and some OSes error out even with `rm -f`.
+$ rm b/nonempty
+
   $ hg up
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg sum
   parent: 1:b8bb4a988f25 tip
commit #1
diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t
--- a/tests/test-commandserver.t
+++ b/tests/test-commandserver.t
@@ -975,12 +975,8 @@
   *** runcommand up -qC 2
   *** runcommand up -qC 1
   *** runcommand merge 2
-  a: path conflict - a file or link has the same name as a directory
-  the local file has been renamed to a~aa04623eb0c3
-  resolve manually then use 'hg resolve --mark a'
-  1 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to 
abandon
-   [1]
+  abort: path 'a/poisoned' traverses symbolic link 'a'
+   [255]
   $ ls ../merge-symlink-out
 
 cache of repo.auditor should be discarded, so matcher would never traverse
diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t
--- a/tests/test-audit-path.t
+++ b/tests/test-audit-path.t
@@ -104,8 +104,7 @@
   back/test
 #if symlink
   $ hg update -Cr2
-  back: is both a file and a directory
-  abort: destination manifest contains path conflicts
+  abort: path 'back/test' traverses symbolic link 'back'
   [255]
 #else
 ('back' will be a file and cause some other system specific error)
@@ -167,24 +166,17 @@
 
   $ hg up -qC 1
   $ hg merge 2
-  a: path conflict - a file or link has the same name as a directory
-  the local file has

Re: [PATCH STABLE] statichttprepo: do not use platform path separator to build a URL

2017-10-30 Thread Augie Fackler 
On Sat, Oct 28, 2017 at 10:25:08PM -0400, Matt Harbison wrote:
> On Sat, 28 Oct 2017 04:38:49 -0400, Yuya Nishihara  wrote:
>
> > # HG changeset patch
> > # User Yuya Nishihara 
> > # Date 1509179032 -32400
> > #  Sat Oct 28 17:23:52 2017 +0900
> > # Branch stable
> > # Node ID ee3492423f7c8b1a350b2596c247e1b97759d2d7
> > # Parent  6e66033f91ccfb7666ec0a25d19954673269c61a
> > statichttprepo: do not use platform path separator to build a URL

queued, thanks
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH STABLE] test-static-http: flush access log per request

2017-10-30 Thread Augie Fackler 
On Mon, Oct 30, 2017 at 11:18:54PM +0900, Yuya Nishihara wrote:
> On Sun, 29 Oct 2017 13:57:47 -0400, Matt Harbison wrote:
> > On Sun, 29 Oct 2017 05:05:17 -0400, Yuya Nishihara  wrote:
> > > # HG changeset patch
> > > # User Yuya Nishihara 
> > > # Date 1509267232 -32400
> > > #  Sun Oct 29 17:53:52 2017 +0900
> > > # Branch stable
> > > # Node ID ce935a5de7737d4706d3f5d50184665f955017e3
> > > # Parent  ee3492423f7c8b1a350b2596c247e1b97759d2d7
> > > test-static-http: flush access log per request

queued, thanks
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D1224: merge: cache unknown dir checks (issue5716)

2017-10-30 Thread durin42 (Augie Fackler) 
durin42 added a comment.


  Is it okay to punt on this until after 4.4?

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1224

To: mbthomas, #hg-reviewers
Cc: durin42, sid0, krbullock, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D1201: dirstate: clean up when restoring identical backups

2017-10-30 Thread durin42 (Augie Fackler) 
durin42 added a comment.


  based on behavior I've seen, this is a recent regression. Landing this series 
for stable.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1201

To: mbthomas, #hg-reviewers, krbullock, durham
Cc: durin42, martinvonz, krbullock, durham, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

D1258: tersestatus: make sure we use os.path.* to split paths (issue5715)

2017-10-30 Thread durin42 (Augie Fackler) 
durin42 commandeered this revision.
durin42 added a reviewer: pulkit.
durin42 added a comment.


  Obsoleted by 362096 as far as I can tell.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1258

To: durin42, #hg-reviewers, yuja, pulkit
Cc: durin42, yuja, mharbison72, mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Re: [PATCH STABLE] test-static-http: flush access log per request

2017-10-30 Thread Yuya Nishihara 
On Sun, 29 Oct 2017 13:57:47 -0400, Matt Harbison wrote:
> On Sun, 29 Oct 2017 05:05:17 -0400, Yuya Nishihara  wrote:
> > # HG changeset patch
> > # User Yuya Nishihara 
> > # Date 1509267232 -32400
> > #  Sun Oct 29 17:53:52 2017 +0900
> > # Branch stable
> > # Node ID ce935a5de7737d4706d3f5d50184665f955017e3
> > # Parent  ee3492423f7c8b1a350b2596c247e1b97759d2d7
> > test-static-http: flush access log per request
> >
> > It appears that stderr is fully buffered on Windows.
> 
> Ugh, I should have known, since I had to fix this in multiple other places  
> before.  Long term, is there any reason that we can't use setvbuf() and  
> _IONBF, since there is no line buffering on Windows?
> 
> https://msdn.microsoft.com/en-us/library/86cebhfs.aspx

I doubt setvbuf() would be an easy workaround since stdio layer is likely to
have weird behavior. And it's completely written in Python 3 to not use the
platform fread/fwrite() API.

> This + the removal of the platform path separators fixes the test for me,
> thanks.

Thanks for testing them.
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel