Patchwork [1,of,2] setup: add missing hgext.fsmonitor

login
register
mail settings
Submitter Sean Farley
Date March 24, 2016, 11:36 p.m.
Message ID <3397fe3d6074a40b492f.1458862617@laptop.office.atlassian.com>
Download mbox | patch
Permalink /patch/14062/
State Accepted
Headers show

Comments

Sean Farley - March 24, 2016, 11:36 p.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1458688082 25200
#      Tue Mar 22 16:08:02 2016 -0700
# Node ID 3397fe3d6074a40b492f63dfb0e4013ceb0c25a7
# Parent  1a1e4350b560cf2f49fe235d2e5168471877462d
# EXP-Topic smf/fix-install
setup: add missing hgext.fsmonitor

Before this patch, fsmonitor was not installed along with other extensions. It
did correctly build the C files needed but forgot to copy over the python
files. This patch fixes it by adding fsmonitor and fsmonitor.pywatchman to the
correct install variable.
Sean Farley - March 24, 2016, 11:38 p.m.
a
Sean Farley <sean@farley.io> writes:

> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1458688082 25200
> #      Tue Mar 22 16:08:02 2016 -0700
> # Node ID 3397fe3d6074a40b492f63dfb0e4013ceb0c25a7
> # Parent  1a1e4350b560cf2f49fe235d2e5168471877462d
> # EXP-Topic smf/fix-install
> setup: add missing hgext.fsmonitor
>
> Before this patch, fsmonitor was not installed along with other extensions. It
> did correctly build the C files needed but forgot to copy over the python
> files. This patch fixes it by adding fsmonitor and fsmonitor.pywatchman to the
> correct install variable.

Argh, forgot to flag this as V2
Yuya Nishihara - March 26, 2016, 1:23 p.m.
On Thu, 24 Mar 2016 16:36:57 -0700, Sean Farley wrote:
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1458688082 25200
> #      Tue Mar 22 16:08:02 2016 -0700
> # Node ID 3397fe3d6074a40b492f63dfb0e4013ceb0c25a7
> # Parent  1a1e4350b560cf2f49fe235d2e5168471877462d
> # EXP-Topic smf/fix-install
> setup: add missing hgext.fsmonitor

The series looks good to me, queued, thanks.

Patch

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -503,12 +503,13 @@  cmdclass = {'build': hgbuild,
             'build_hgexe': buildhgexe,
             }
 
 packages = ['mercurial', 'mercurial.hgweb', 'mercurial.httpclient',
             'mercurial.pure',
-            'hgext', 'hgext.convert', 'hgext.highlight', 'hgext.largefiles',
-            'hgext.zeroconf', 'hgext3rd']
+            'hgext', 'hgext.convert', 'hgext.fsmonitor',
+            'hgext.fsmonitor.pywatchman', 'hgext.highlight',
+            'hgext.largefiles', 'hgext.zeroconf', 'hgext3rd']
 
 common_depends = ['mercurial/util.h']
 
 osutil_ldflags = []