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

login
register
mail settings
Submitter Sean Farley
Date March 22, 2016, 11:17 p.m.
Message ID <c330ac3641660d028c23.1458688678@laptop.office.atlassian.com>
Download mbox | patch
Permalink /patch/14033/
State Superseded
Commit 776fd2e2cf5a92a9cea9f36003054cee069206f3
Headers show

Comments

Sean Farley - March 22, 2016, 11:17 p.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1458688082 25200
#      Tue Mar 22 16:08:02 2016 -0700
# Node ID c330ac3641660d028c235ad969dd5a7eda1b018c
# Parent  c11f0992d1246286a6a0b2531ff5f31948abcf58
# 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 to the correct variable.
Sean Farley - March 22, 2016, 11:18 p.m.
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 c330ac3641660d028c235ad969dd5a7eda1b018c
> # Parent  c11f0992d1246286a6a0b2531ff5f31948abcf58
> # 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 to the correct variable.

Feel free to fold these two patches together.
Martijn Pieters - March 23, 2016, 12:09 a.m.
On 22 March 2016 at 16:17, Sean Farley <sean@farley.io> wrote:
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1458688082 25200
> #      Tue Mar 22 16:08:02 2016 -0700
> # Node ID c330ac3641660d028c235ad969dd5a7eda1b018c
> # Parent  c11f0992d1246286a6a0b2531ff5f31948abcf58
> # 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 to the correct variable.

Thanks for covering this!

Patch

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -503,12 +503,12 @@  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.highlight',
+            'hgext.largefiles', 'hgext.zeroconf', 'hgext3rd']
 
 common_depends = ['mercurial/util.h']
 
 osutil_ldflags = []