muggs: got that fixed in f83291e5643e.

Can you push that fix for ui.py?

http://bitbucket.org/tortoisehg/stable/issue/891/launching-web-server-error

Okay... Can we make it get it right by making file-level merge more like
manifest-level merge?

From up --debug:

resolving manifests
 ...
 ancestor 1139fcfeaeda local 1139fcfeaeda+ remote a275c3997e03
...
merging mercurial/ui.py
my mercurial/ui.py@1139fcfeaeda+ other mercurial/ui.py@a275c3997e03 ancestor
mercurial/ui.py@9e7b2c49d25d
 premerge successful

Note that this is a 'backwards merge', which has weird semantics. Manifest
merge gets it right (starting recently), file-level merge gets it wrong (and
always has).

I cannot find any major release doing this right down to 1.0.

Here is the relevant graph portion:

o    changeset:   10195:1139fcfeaeda
|\   parent:      10192:8161127a638f
| |  parent:      10194:a275c3997e03
| |  user:        Matt Mackall <mpm@selenic.com>
| |  date:        Fri Jan 01 18:10:10 2010 -0600
| |  summary:     Merge with stable
| |
| @  changeset:   10194:a275c3997e03
| |  branch:      stable
| |  user:        Matt Mackall <mpm@selenic.com>
| |  date:        Fri Jan 01 17:58:35 2010 -0600
| |  summary:     Added signature for changeset 296a0b14a686
| |
.


ui.py is merge with both other and common ancestor set to the filelog
version in a275c3997e03. The merge works if 1139fcfeaeda is used a common
ancestor instead.

Isn't this something we used to get right?

djc@miles crew $ hg id -nib
1139fcfeaeda+ 10195+ default
djc@miles crew $ hg diff
diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -234,7 +234,8 @@

     def write_err(self, *args):
         try:
-            if not sys.stdout.closed: sys.stdout.flush()
+            if not hasattr(sys.stdout, 'closed') or not sys.stdout.closed:
+                sys.stdout.flush()
             for a in args:
                 sys.stderr.write(str(a))
             # stderr may be buffered under win32 when redirected to files,
djc@miles crew $ hg up stable
merging mercurial/ui.py
251 files updated, 1 files merged, 148 files removed, 0 files unresolved
djc@miles crew $ hg id -nib
a275c3997e03+ 10194+ stable
djc@miles crew $ hg diff
diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -29,8 +29,11 @@
             self._ocfg = src._ocfg.copy()
             self._trustusers = src._trustusers.copy()
             self._trustgroups = src._trustgroups.copy()
+            self.environ = src.environ
             self.fixconfig()
         else:
+            # shared read-only environment
+            self.environ = os.environ
             # we always trust global config files
             for f in util.rcpath():
                 self.readconfig(f, trust=True)
@@ -231,7 +234,8 @@

     def write_err(self, *args):
         try:
-            if not sys.stdout.closed: sys.stdout.flush()
+            if not hasattr(sys.stdout, 'closed') or not sys.stdout.closed:
+                sys.stdout.flush()
             for a in args:
                 sys.stderr.write(str(a))
             # stderr may be buffered under win32 when redirected to files,
@@ -250,7 +254,13 @@
     def interactive(self):
         i = self.configbool("ui", "interactive", None)
         if i is None:
-            return sys.stdin.isatty()
+            try:
+                return sys.stdin.isatty()
+            except AttributeError:
+                # some environments replace stdin without implementing isatty
+                # usually those are non-interactive
+                return False
+
         return i

     def _readline(self, prompt=''):