##// END OF EJS Templates
summary: clear "commonincoming" also if branches are different...
summary: clear "commonincoming" also if branches are different Before this patch, "commonincoming" calculated by "discovery.findcommonincoming()" is cleared, only if "default" URL without branch part (tail "#branch" of URL) differs from "default-push" URL without branch part. But common revisions in "commonincoming" calculated for a branch doesn't include ones for another branch, even if URLs without branch part are same. The result of "discovery.findcommonoutgoing()" invocation with such "commonincoming" becomes incorrect in some cases. This patch clears "commonincoming", also if branch part of "default" differs from one of "default-push". To avoid redundant looking up: - "ui.expandpath('default')" and "ui.expandpath('default-push', 'default')" are not compared directly, even though they contain branch information, because they are not yet normalized by "hg.parseurl()": tail "/" of path, for example - "commonincoming" is not cleared, if branch isn't specified in "default" URL, because such "commonincoming" contains common revisions for all branches This patch also tests "different path, same branch" pattern to check careless degrading around comparison between source and destination.

File last commit:

r13400:14f3795a default
r18997:4cf09a1b default
Show More
__init__.py
44 lines | 1.3 KiB | text/x-python | PythonLexer
# __init__.py - low-level interfaces to the Linux inotify subsystem
# Copyright 2006 Bryan O'Sullivan <bos@serpentine.com>
# This library is free software; you can redistribute it and/or modify
# it under the terms of version 2.1 of the GNU Lesser General Public
# License, or any later version.
'''Low-level interface to the Linux inotify subsystem.
The inotify subsystem provides an efficient mechanism for file status
monitoring and change notification.
This package provides the low-level inotify system call interface and
associated constants and helper functions.
For a higher-level interface that remains highly efficient, use the
inotify.watcher package.'''
__author__ = "Bryan O'Sullivan <bos@serpentine.com>"
from _inotify import *
procfs_path = '/proc/sys/fs/inotify'
def _read_procfs_value(name):
def read_value():
try:
fp = open(procfs_path + '/' + name)
r = int(fp.read())
fp.close()
return r
except OSError:
return None
read_value.__doc__ = '''Return the value of the %s setting from /proc.
If inotify is not enabled on this system, return None.''' % name
return read_value
max_queued_events = _read_procfs_value('max_queued_events')
max_user_instances = _read_procfs_value('max_user_instances')
max_user_watches = _read_procfs_value('max_user_watches')