Feed All Stories

Yesterday

durin42 committed rHGa9be0ab0525a: Added tag 4.7rc0 for changeset e90130af47ce.
Added tag 4.7rc0 for changeset e90130af47ce
Thu, Jul 19, 2:26 PM
durin42 committed rHG10d40c83205b: Added signature for changeset e90130af47ce.
Added signature for changeset e90130af47ce
Thu, Jul 19, 2:26 PM
indygreg closed D3966: configitems: restore alias for format.aggressivemergedeltas.
Thu, Jul 19, 2:13 PM
indygreg committed rHGe90130af47ce: configitems: restore alias for format.aggressivemergedeltas.
configitems: restore alias for format.aggressivemergedeltas
Thu, Jul 19, 2:13 PM
khanchi97 closed D3965: histedit: drop --no-backup option.
Thu, Jul 19, 2:13 PM
durin42 committed rHG7acec9408e1c: release: merge default into stable for 4.7 release freeze.
release: merge default into stable for 4.7 release freeze
Thu, Jul 19, 2:13 PM
yuja committed rHGc08ea1e219c0: worker: call selector.close() to release polling resources.
worker: call selector.close() to release polling resources
Thu, Jul 19, 2:13 PM
khanchi97 committed rHGfaea9b1980d9: histedit: drop --no-backup option.
histedit: drop --no-backup option
Thu, Jul 19, 2:13 PM
durin42 accepted D3966: configitems: restore alias for format.aggressivemergedeltas.
Thu, Jul 19, 2:11 PM
indygreg created D3966: configitems: restore alias for format.aggressivemergedeltas.
Thu, Jul 19, 2:11 PM
durin42 accepted D3965: histedit: drop --no-backup option.
Thu, Jul 19, 1:55 PM
khanchi97 created D3965: histedit: drop --no-backup option.
Thu, Jul 19, 1:52 PM
lothiraldan committed rHG913ca175c4ae: aggressivemergedelta: document rename and move to `revlog` section.
aggressivemergedelta: document rename and move to `revlog` section
Thu, Jul 19, 9:16 AM
lothiraldan committed rHG93777d16a25d: aggressivemergedeltas: rename variable internally.
aggressivemergedeltas: rename variable internally
Thu, Jul 19, 9:16 AM
lothiraldan committed rHG8891dc15b327: config: document the purpose of the `format` config section.
config: document the purpose of the `format` config section
Thu, Jul 19, 9:16 AM
khanchi97 closed D3901: histedit: add history-editing-backup config option.
Thu, Jul 19, 8:29 AM
rdamazio committed rHG25880ddf9a86: macosx: fixing macOS version generation after db9d1dd01bf0.
macosx: fixing macOS version generation after db9d1dd01bf0
Thu, Jul 19, 8:28 AM
rdamazio closed D3964: macosx: fixing macOS version generation after db9d1dd01bf0.
Thu, Jul 19, 8:28 AM
khanchi97 committed rHGc2586a6e5884: histedit: add history-editing-backup config option.
histedit: add history-editing-backup config option
Thu, Jul 19, 8:28 AM
yuja added a comment to D3901: histedit: add history-editing-backup config option.

Queued with some typo fixes, thanks.

Thu, Jul 19, 8:23 AM
indygreg closed D3963: merge: mark file gets as not thread safe.
Thu, Jul 19, 8:19 AM
indygreg committed rHGbe4984261611: merge: mark file gets as not thread safe (issue5933).
merge: mark file gets as not thread safe (issue5933)
Thu, Jul 19, 8:18 AM
indygreg closed D3962: worker: ability to disable thread unsafe tasks.
Thu, Jul 19, 8:18 AM
indygreg committed rHGef3838a47503: worker: ability to disable thread unsafe tasks.
worker: ability to disable thread unsafe tasks
Thu, Jul 19, 8:18 AM
indygreg committed rHG69ed2cff4277: worker: rename variable to reflect constant.
worker: rename variable to reflect constant
Thu, Jul 19, 8:18 AM
indygreg closed D3961: worker: rename variable to reflect constant.
Thu, Jul 19, 8:18 AM
hooper committed rHG9e6afe7fca31: worker: use one pipe per posix worker and select() in parent process.
worker: use one pipe per posix worker and select() in parent process
Thu, Jul 19, 8:18 AM
hooper closed D3960: worker: use one pipe per posix worker and select() in parent process.
Thu, Jul 19, 8:18 AM
yuja added a comment to D3960: worker: use one pipe per posix worker and select() in parent process.

Queued, thanks. We'll probably need selector.close() somewhere.

Thu, Jul 19, 8:15 AM
yuja added a comment to D3962: worker: ability to disable thread unsafe tasks.
if pycompat.isposix or pycompat.iswindows:
    _STARTUP_COST = 0.01

+ # The Windows worker is thread based. If tasks are CPU bound, threads
+ # in the presence of the GIL result in excessive context switching and
+ # this overhead can slow down execution.
+ _DISALLOW_THREAD_UNSAFE = True

Thu, Jul 19, 8:15 AM
lothiraldan accepted D3963: merge: mark file gets as not thread safe.
Thu, Jul 19, 3:06 AM
lothiraldan accepted D3962: worker: ability to disable thread unsafe tasks.
Thu, Jul 19, 3:03 AM
lothiraldan accepted D3961: worker: rename variable to reflect constant.
Thu, Jul 19, 3:02 AM

Wed, Jul 18

rdamazio added a comment to D3964: macosx: fixing macOS version generation after db9d1dd01bf0.

This is python code, why is it parsing the version file instead of importing it?

Wed, Jul 18, 10:31 PM
rdamazio added a comment to D3964: macosx: fixing macOS version generation after db9d1dd01bf0.

Hmm and nevermind, the weird package name doesn't reproduce on a vanilla hg build, you can go ahead and review.

Wed, Jul 18, 10:30 PM
glandium added a comment to D3964: macosx: fixing macOS version generation after db9d1dd01bf0.

This is python code, why is it parsing the version file instead of importing it?

Wed, Jul 18, 10:14 PM
rdamazio added a comment to D3964: macosx: fixing macOS version generation after db9d1dd01bf0.

Er, actually, let me fix this again - this unbreaks the build but generates packages like 'Mercurial-"4.6.2+674-f83600efa1ca-macosx10.13.dmg'.

Wed, Jul 18, 10:02 PM
rdamazio retitled D3964: macosx: fixing macOS version generation after db9d1dd01bf0 from macosx: fixing macOS version generation after dbbe45ae5ad1 to macosx: fixing macOS version generation after db9d1dd01bf0.
Wed, Jul 18, 9:48 PM
rdamazio created D3964: macosx: fixing macOS version generation after db9d1dd01bf0.
Wed, Jul 18, 9:45 PM
khanchi97 added a comment to D3901: histedit: add history-editing-backup config option.

And, should we drop the --no-backup option? @pulkit what do you think?

Yep, we should either have this option everywhere or not have it anywhere. I too think that config option is better suited here. Let's drop it and comment on the bug which needed the flag about the config option.

How do we drop a feature? Do I need to remove all the code related to --no-backup option?

Wed, Jul 18, 4:01 PM
khanchi97 added a comment to D3901: histedit: add history-editing-backup config option.

Because this option has not been part of a release yet. There is no point of releasing a deprecated feature.

Got it. Thanks!

Wed, Jul 18, 3:56 PM
pulkit added a comment to D3901: histedit: add history-editing-backup config option.

And, should we drop the --no-backup option?

IIUC,
dropped -> user won't be able to use that option
deprecated -> can use, but this is not preferred option to use
Am I right above?

Wed, Jul 18, 3:16 PM
pulkit added a comment to D3901: histedit: add history-editing-backup config option.
In D3901#61668, @yuja wrote:

+coreconfigitem('ui', 'historyediting_backup',
+ default=True,
+)

coreconfigitem('ui', 'interactive',
    default=None,
)

diff --git a/hgext/histedit.py b/hgext/histedit.py

    • a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1111,7 +1111,8 @@ fm.startitem() goal = _getgoal(opts) revs = opts.get('rev', [])
  • nobackup = opts.get('no_backup') + nobackup = (opts.get('no_backup') or + not ui.configbool('ui', 'historyediting_backup'))

history-editing-backup per new rule.

https://www.mercurial-scm.org/wiki/UIGuideline#config

Can you add # experimental config: ui.history-editing-backup to silence
check-config? It's probably too late to add full support for this option
and make it documented.

And, should we drop the --no-backup option? @pulkit what do you think?

Wed, Jul 18, 3:14 PM
hooper added a comment to D3960: worker: use one pipe per posix worker and select() in parent process.

Do you want to move the selector import stuff to pycompat?

Wed, Jul 18, 2:59 PM
hooper updated the diff for D3960: worker: use one pipe per posix worker and select() in parent process.
Wed, Jul 18, 2:45 PM
khanchi97 added a comment to D3901: histedit: add history-editing-backup config option.

And, should we drop the --no-backup option?

IIUC,
dropped -> user won't be able to use that option
deprecated -> can use, but this is not preferred option to use
Am I right above?
If yes, why not deprecate then?

Wed, Jul 18, 1:45 PM
khanchi97 updated the diff for D3901: histedit: add history-editing-backup config option.
Wed, Jul 18, 1:29 PM
indygreg updated the diff for D3963: merge: mark file gets as not thread safe.
Wed, Jul 18, 12:55 PM
indygreg updated the diff for D3962: worker: ability to disable thread unsafe tasks.
Wed, Jul 18, 12:55 PM
yuja added a comment to D3959: rebase: add --stop option to stop rebase at any point (issue5206).

+ def _stoprebase(self):
+ """stop the interrupted rebase"""
+ self.restorestatus()
+ if not self.stateobj.exists():
+ raise error.Abort(_("no interrupted rebase found"))
+ allowunstable = obsolete.isenabled(self.repo, obsolete.allowunstableopt)
+ if not (self.keepf or allowunstable):
+ raise error.Abort(_("can't remove original changesets with"
+ " unrebased descendants"),
+ hint=_('either enable evolve extension to allow unstable '
+ 'revisions or use --keep to keep original changesets'))
+
+ # update to the last rebased node if any
+ ctx = self.repo[None]
+ pars = [p.node() for p in ctx.parents()]
+ p1 = pars[0]
+ hg.updaterepo(self.repo, p1, overwrite=True)

Wed, Jul 18, 9:01 AM
yuja updated subscribers of D3901: histedit: add history-editing-backup config option.

+coreconfigitem('ui', 'historyediting_backup',
+ default=True,
+)

coreconfigitem('ui', 'interactive',
    default=None,
)

diff --git a/hgext/histedit.py b/hgext/histedit.py

    • a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1111,7 +1111,8 @@ fm.startitem() goal = _getgoal(opts) revs = opts.get('rev', [])
  • nobackup = opts.get('no_backup') + nobackup = (opts.get('no_backup') or + not ui.configbool('ui', 'historyediting_backup'))
Wed, Jul 18, 8:34 AM
joerg.sonnenberger closed D1945: tests: refactor common bundle2 capabilities.
Wed, Jul 18, 8:30 AM
joerg.sonnenberger committed rHG88be288e8ac1: tests: refactor common bundle2 capabilities.
tests: refactor common bundle2 capabilities
Wed, Jul 18, 8:30 AM
yuja added a comment to D3963: merge: mark file gets as not thread safe.

My two cents. It's better to add a flag to enable threading (e.g. threadsafe)
instead of cpuheavy, and make it off by default.

Wed, Jul 18, 8:07 AM
yuja added a comment to D3955: mail: modernize check for Python-with-TLS.
>   Maybe we can simply remove the check since we've dropped support for
>   Python 2.5.

No, we're looking to see if the ssl module is importable - if it's not, that means Python was compiled without TLS support (which is an option, even on 3.x and 2.7). I'm just sniffing for this particular attribute to force the import.
Wed, Jul 18, 7:48 AM
yuja added a comment to D3960: worker: use one pipe per posix worker and select() in parent process.

@@ -138,7 +138,15 @@

oldchldhandler = signal.signal(signal.SIGCHLD, sigchldhandler)
ui.flush()
parentpid = os.getpid()

+ pipes = []

for pargs in partition(args, workers):

+ # Every worker gets its own pipe to send results on, so we don't have to
+ # implement atomic writes larger than PIPE_BUF. Each forked process has
+ # its own pipe's descriptors in the local variables, and the parent
+ # process has the full list of pipe descriptors (and it doesn't really
+ # care what order they're in).
+ rfd, wfd = os.pipe()
+ pipes.append((rfd, wfd))

    1. make sure we use os._exit in all worker code paths. otherwise the
    2. worker may do some clean-ups which could cause surprises like
    3. deadlock. see sshpeer.cleanup for example. @@ -175,8 +183,10 @@ finally: os._exit(ret & 255) pids.add(pid)
  • os.close(wfd)
  • fp = os.fdopen(rfd, r'rb', 0) + fps = [] + for rfd, wfd in pipes: + os.close(wfd) + fps.append(os.fdopen(rfd, r'rb', 0))
Wed, Jul 18, 7:37 AM

Tue, Jul 17

durin42 added a comment to D3955: mail: modernize check for Python-with-TLS.
Maybe we can simply remove the check since we've dropped support for
Python 2.5.
Tue, Jul 17, 9:30 PM
indygreg updated subscribers of D3963: merge: mark file gets as not thread safe.

CC @wlis since this change will impact Facebook. I'd also appreciate validation of my assertions in the commit message about the behavior of remotefilelog and working directory updates being more I/O than CPU/GIL bound.

Tue, Jul 17, 8:45 PM
indygreg created D3963: merge: mark file gets as not thread safe.
Tue, Jul 17, 8:43 PM
indygreg created D3962: worker: ability to disable thread unsafe tasks.
Tue, Jul 17, 8:43 PM
indygreg added a dependent revision for D3962: worker: ability to disable thread unsafe tasks: D3963: merge: mark file gets as not thread safe.
Tue, Jul 17, 8:43 PM
indygreg added a dependent revision for D3961: worker: rename variable to reflect constant: D3962: worker: ability to disable thread unsafe tasks.
Tue, Jul 17, 8:43 PM
indygreg created D3961: worker: rename variable to reflect constant.
Tue, Jul 17, 8:43 PM
hooper created D3960: worker: use one pipe per posix worker and select() in parent process.
Tue, Jul 17, 6:44 PM
khanchi97 created D3959: rebase: add --stop option to stop rebase at any point (issue5206).
Tue, Jul 17, 3:43 PM
lothiraldan committed rHGfcb517ff9562: debug: move extensions debug behind a dedicated flag.
debug: move extensions debug behind a dedicated flag
Tue, Jul 17, 9:46 AM
spectral closed D3948: curses: use "text" interface if TERM=dumb.
Tue, Jul 17, 9:37 AM
spectral committed rHGd79f3afb079e: curses: use "text" interface if TERM=dumb.
curses: use "text" interface if TERM=dumb
Tue, Jul 17, 9:37 AM
yuja added a comment to D3957: patchbomb: python 3 really wants those email addresses in unicode.
  • sendmail(sender_addr, to + bcc + cc, fp.getvalue()) + alldests = to + bcc + cc + alldests = [pycompat.strurl(d) for d in alldests] + sendmail(sender_addr, alldests, fp.getvalue())
Tue, Jul 17, 9:25 AM
yuja added a comment to D3954: mail: cope with Py3 unicode antics on email addresses.
  • return email.utils.formataddr((name, addr)) + return pycompat.bytesurl( + email.utils.formataddr((name, addr.decode('ascii'))))
Tue, Jul 17, 9:25 AM
yuja added a comment to D3955: mail: modernize check for Python-with-TLS.

+def _pyhastls():
+ """Returns true iff Python has TLS support, false otherwise."""
+ try:
+ import ssl
+ getattr(ssl, 'HAS_TLS', False)
+ return True
+ except ImportError:
+ return False

Tue, Jul 17, 9:25 AM
yuja added a comment to D3956: mail: stop using the smtplib.SSLFakeFile and use socket.socket.makefile.

I'm not pretty sure, but missing 'rb'?

Tue, Jul 17, 9:25 AM
yuja added a comment to D3951: patchbomb: work around email module really wanting to write unicode data.

Maybe BytesGenerator can be used instead?

Tue, Jul 17, 9:25 AM
mharbison72 committed rHG02b5b5c1bba8: windows: replace single quote with double quote when translating to cmd.exe.
windows: replace single quote with double quote when translating to cmd.exe
Tue, Jul 17, 8:32 AM
mharbison72 committed rHGc382c19ce9bd: windows: expand '~/' and '~\' to %USERPROFILE% when translating to cmd.exe.
windows: expand '~/' and '~\' to %USERPROFILE% when translating to cmd.exe
Tue, Jul 17, 8:32 AM
mharbison72 committed rHG2009d84f245a: hook: disable the shell to native command translation by default.
hook: disable the shell to native command translation by default
Tue, Jul 17, 8:32 AM
mharbison72 committed rHGf9b2d996ffa5: hook: only print the note about native cmd translation if it actually changes.
hook: only print the note about native cmd translation if it actually changes
Tue, Jul 17, 8:32 AM
glandium committed rHGdbbe45ae5ad1: setup: allow to run setup.py with python 3 without a mercurial checkout.
setup: allow to run setup.py with python 3 without a mercurial checkout
Tue, Jul 17, 7:53 AM

Mon, Jul 16

glandium committed rHG7d8aa0746b71: Allow to run setup.py with python 3 without a mercurial checkout.
Allow to run setup.py with python 3 without a mercurial checkout
Mon, Jul 16, 9:42 PM
indygreg closed D3958: Allow to run setup.py with python 3 without a mercurial checkout.
Mon, Jul 16, 8:48 PM
indygreg committed rHGd5b31ae9cc0a: Allow to run setup.py with python 3 without a mercurial checkout.
Allow to run setup.py with python 3 without a mercurial checkout
Mon, Jul 16, 8:48 PM
indygreg accepted D3958: Allow to run setup.py with python 3 without a mercurial checkout.

I'm OK with this undocumented hack. And there are cases where we may want to test setup.py outside the context of a checkout as well. The important thing is end-users not running Mercurial with Python 3 unknowingly.

Mon, Jul 16, 8:47 PM
glandium created D3958: Allow to run setup.py with python 3 without a mercurial checkout.
Mon, Jul 16, 8:43 PM
madprog committed rHG4ad2a1ff0404: upgrade: add information about sparse-revlog.
upgrade: add information about sparse-revlog
Mon, Jul 16, 8:12 PM
madprog committed rHGd12415b8f833: upgrade: enable adding or removing sparse-revlog requirement.
upgrade: enable adding or removing sparse-revlog requirement
Mon, Jul 16, 8:12 PM
madprog committed rHGf8762ea73e0d: sparse-revlog: implement algorithm to write sparse delta chains (issue5480).
sparse-revlog: implement algorithm to write sparse delta chains (issue5480)
Mon, Jul 16, 8:09 PM
madprog committed rHGaa21a9ad46ea: sparse-revlog: new requirement enabled with format.sparse-revlog.
sparse-revlog: new requirement enabled with format.sparse-revlog
Mon, Jul 16, 8:09 PM
madprog committed rHGc67093e81a3e: revlog: extract `deltainfo.distance` for future conditional redefinition.
revlog: extract `deltainfo.distance` for future conditional redefinition
Mon, Jul 16, 7:58 PM
durin42 created D3957: patchbomb: python 3 really wants those email addresses in unicode.
Mon, Jul 16, 7:16 PM
durin42 added a dependent revision for D3956: mail: stop using the smtplib.SSLFakeFile and use socket.socket.makefile: D3957: patchbomb: python 3 really wants those email addresses in unicode.
Mon, Jul 16, 7:16 PM
durin42 created D3956: mail: stop using the smtplib.SSLFakeFile and use socket.socket.makefile.
Mon, Jul 16, 7:16 PM
durin42 added a dependent revision for D3955: mail: modernize check for Python-with-TLS: D3956: mail: stop using the smtplib.SSLFakeFile and use socket.socket.makefile.
Mon, Jul 16, 7:16 PM
durin42 created D3955: mail: modernize check for Python-with-TLS.
Mon, Jul 16, 7:16 PM
durin42 created D3954: mail: cope with Py3 unicode antics on email addresses.
Mon, Jul 16, 7:16 PM
durin42 added a dependent revision for D3954: mail: cope with Py3 unicode antics on email addresses: D3955: mail: modernize check for Python-with-TLS.
Mon, Jul 16, 7:16 PM
durin42 added a dependent revision for D3953: mail: fix _encode to be more correct on Python 3: D3954: mail: cope with Py3 unicode antics on email addresses.
Mon, Jul 16, 7:16 PM
durin42 created D3953: mail: fix _encode to be more correct on Python 3.
Mon, Jul 16, 7:16 PM
durin42 added a dependent revision for D3952: patchbomb: ensure all headers and values given to email mod are native strings: D3953: mail: fix _encode to be more correct on Python 3.
Mon, Jul 16, 7:16 PM
durin42 created D3952: patchbomb: ensure all headers and values given to email mod are native strings.
Mon, Jul 16, 7:16 PM
durin42 added a dependent revision for D3951: patchbomb: work around email module really wanting to write unicode data: D3952: patchbomb: ensure all headers and values given to email mod are native strings.
Mon, Jul 16, 7:16 PM