mucbuc / configs (public) (License: Unspecified) (since 2020-07-03) (hash sha1)
No description available
Clone URLs: https://rocketgit.com/user/mucbuc/configs ssh://rocketgit@ssh.rocketgit.com/user/mucbuc/configs git://git.rocketgit.com/user/mucbuc/configs
Merge request 6 (3085884efad6701037ead5fafc816e1e061f4f3e -> 12ab455e7786c20019679edba5107a7f579dc126)
By: anonymous
Against ref: refs/heads/dev
Date: 2020-08-23 20:06
This merge request can be merged without conflicts.
List of commits:
Subject Hash Author Date (UTC)
remove space 12ab455e7786c20019679edba5107a7f579dc126 mucbuc 2020-08-23 20:06:40
working on example 82a1df4d3f6c5e5405eae35f277572fc51b9a947 mucbuc 2020-08-23 20:02:57
Commit 12ab455e7786c20019679edba5107a7f579dc126 - remove space
Author: mucbuc
Author date (UTC): 2020-08-23 20:06
Committer name: mucbuc
Committer date (UTC): 2020-08-23 20:06
Parent(s): 82a1df4d3f6c5e5405eae35f277572fc51b9a947
Signer:
Signing key:
Signing status: N
Tree: 7860cab81bbf82cd652d64053c252ff21f3ff4db
File Lines added Lines deleted
templates.js 3 3
File templates.js changed (mode: 100755) (index 2f6007e..ea1b6e3)
... ... function generateExample(name) {
12 12 const exampleTemplate = 'var result = `' + fs.readFileSync('./res/example.cpp.bp', 'utf8' ) + '`;'; const exampleTemplate = 'var result = `' + fs.readFileSync('./res/example.cpp.bp', 'utf8' ) + '`;';
13 13 const context = { name: "sample" }; const context = { name: "sample" };
14 14
15 console.log( exampleTemplate );
15 console.log( exampleTemplate );
16 16
17 vm.createContext(context);
17 vm.createContext(context);
18 18 vm.runInContext(exampleTemplate, context); vm.runInContext(exampleTemplate, context);
19 19
20 console.log(context.result);
20 console.log(context.result);
21 21 } }
22 22
23 23
Commit 82a1df4d3f6c5e5405eae35f277572fc51b9a947 - working on example
Author: mucbuc
Author date (UTC): 2020-08-23 20:02
Committer name: mucbuc
Committer date (UTC): 2020-08-23 20:02
Parent(s): 3085884efad6701037ead5fafc816e1e061f4f3e
Signer:
Signing key:
Signing status: N
Tree: f2cc507a68289effc1ff6a81347a5f5e63c31694
File Lines added Lines deleted
res/example.cpp.bp 12 0
templates.js 20 3
File res/example.cpp.bp added (mode: 100644) (index 0000000..11132f6)
1 #include <tmp/src/test.h>
2
3 #include <lib/${name}/src/index.h>
4
5 using namespace std;
6 using namespace om636::${name};
7
8 int main()
9 {
10 ASSERT(0 && "fail");
11 return 0;
12 }
File templates.js changed (mode: 100755) (index d625343..2f6007e)
1 1 #!/usr/bin/env node #!/usr/bin/env node
2 2
3 3 const { exec, pushd } = require( 'shelljs' ), const { exec, pushd } = require( 'shelljs' ),
4 path = require( 'path' );
4 path = require( 'path' ),
5 fs = require( 'fs' ),
6 vm = require( 'vm' );
5 7
6 makeDirs();
8 //makeTestDirs();
9 generateExample("sample");
7 10
8 function makeDirs() {
11 function generateExample(name) {
12 const exampleTemplate = 'var result = `' + fs.readFileSync('./res/example.cpp.bp', 'utf8' ) + '`;';
13 const context = { name: "sample" };
14
15 console.log( exampleTemplate );
16
17 vm.createContext(context);
18 vm.runInContext(exampleTemplate, context);
19
20 console.log(context.result);
21 }
22
23
24
25 function makeTestDirs() {
9 26 const basename = path.basename( __dirname ); const basename = path.basename( __dirname );
10 27
11 28 exec( 'mkdir -p test/lib/' ); exec( 'mkdir -p test/lib/' );
Hints:
How to merge on your machine?
git fetch origin refs/mr/6:mr-6
git checkout main
git merge mr-6

To "see" all the merge requests as branches,
add, in the config file (.git/config), under the remote you want, a line like this:
fetch = +refs/mr/*:refs/remotes/your_remote_name_for_example_origin/mr/*
After you run a git fetch, you will have all the pull requests locally.
For example, you can merge one of them:
git checkout main
git merge mr/6